From dbde1b65f780afde3836eefb5f72a7f850013e36 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <riastradh@NetBSD.org>
Date: Wed, 19 Jan 2022 00:11:49 +0000
Subject: [PATCH 11/39] specfs: Factor common kauth check out of switch in
spec_open.
No functional change.
---
sys/miscfs/specfs/spec_vnops.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 9cae9ad7cfe7..84b89a03b195 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -546,13 +546,12 @@ spec_open(void *v)
req = KAUTH_REQ_DEVICE_RAWIO_SPEC_READ;
break;
}
+ error = kauth_authorize_device_spec(ap->a_cred, req, vp);
+ if (error != 0)
+ return (error);
switch (vp->v_type) {
case VCHR:
- error = kauth_authorize_device_spec(ap->a_cred, req, vp);
- if (error != 0)
- return (error);
-
/*
* Character devices can accept opens from multiple
* vnodes.
@@ -595,10 +594,6 @@ spec_open(void *v)
break;
case VBLK:
- error = kauth_authorize_device_spec(ap->a_cred, req, vp);
- if (error != 0)
- return (error);
-
/*
* For block devices, permit only one open. The buffer
* cache cannot remain self-consistent with multiple