summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsapuntz <csapuntz@openbsd.org>1997-12-28 19:34:49 +0000
committercsapuntz <csapuntz@openbsd.org>1997-12-28 19:34:49 +0000
commit12a88359761fd6d7d376b09e409641137a377c24 (patch)
tree08af790d9b6018654fc1af17f8274f79be6a1d0f
parentInitialize mbuf::pnext. (diff)
downloadwireguard-openbsd-12a88359761fd6d7d376b09e409641137a377c24.tar.xz
wireguard-openbsd-12a88359761fd6d7d376b09e409641137a377c24.zip
I should be more careful about what I check in. Undo earlier commenting-out
of security check. Restricted access to /dev/memat higher secure levels now enabled.
-rw-r--r--sys/kern/spec_vnops.c6
-rw-r--r--sys/miscfs/specfs/spec_vnops.c6
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index 2d70674a2ac..9302a8520ef 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spec_vnops.c,v 1.13 1997/11/06 20:04:35 csapuntz Exp $ */
+/* $OpenBSD: spec_vnops.c,v 1.14 1997/12/28 19:34:49 csapuntz Exp $ */
/* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */
/*
@@ -146,10 +146,8 @@ spec_open(v)
} */ *ap = v;
struct proc *p = ap->a_p;
struct vnode *vp = ap->a_vp;
-#if 0
struct vnode *bvp;
dev_t bdev;
-#endif
dev_t dev = (dev_t)vp->v_rdev;
register int maj = major(dev);
int error;
@@ -178,7 +176,6 @@ spec_open(v)
* devices whose corresponding block devices are
* currently mounted.
*/
-#if 0
if (securelevel >= 1) {
if ((bdev = chrtoblk(dev)) != NODEV &&
vfinddev(bdev, VBLK, &bvp) &&
@@ -188,7 +185,6 @@ spec_open(v)
if (iskmemdev(dev))
return (EPERM);
}
-#endif
}
if (cdevsw[maj].d_type == D_TTY)
vp->v_flag |= VISTTY;
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 2d70674a2ac..9302a8520ef 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spec_vnops.c,v 1.13 1997/11/06 20:04:35 csapuntz Exp $ */
+/* $OpenBSD: spec_vnops.c,v 1.14 1997/12/28 19:34:49 csapuntz Exp $ */
/* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */
/*
@@ -146,10 +146,8 @@ spec_open(v)
} */ *ap = v;
struct proc *p = ap->a_p;
struct vnode *vp = ap->a_vp;
-#if 0
struct vnode *bvp;
dev_t bdev;
-#endif
dev_t dev = (dev_t)vp->v_rdev;
register int maj = major(dev);
int error;
@@ -178,7 +176,6 @@ spec_open(v)
* devices whose corresponding block devices are
* currently mounted.
*/
-#if 0
if (securelevel >= 1) {
if ((bdev = chrtoblk(dev)) != NODEV &&
vfinddev(bdev, VBLK, &bvp) &&
@@ -188,7 +185,6 @@ spec_open(v)
if (iskmemdev(dev))
return (EPERM);
}
-#endif
}
if (cdevsw[maj].d_type == D_TTY)
vp->v_flag |= VISTTY;