diff options
| author |   pedro <pedro@openbsd.org> | 2004-05-10 22:36:21 +0000 |
|---|---|---|
| committer | pedro <pedro@openbsd.org> | 2004-05-10 22:36:21 +0000 |
| commit | ee878cc78cf8e9e0f30af77478e0bd0c1dfc703f (patch) | |
| tree | 5ac544a100f16d91feaf632646dc47016d717d9a | |
| parent | Manpage for mediabay (diff) | |
| download | wireguard-openbsd-ee878cc78cf8e9e0f30af77478e0bd0c1dfc703f.tar.xz wireguard-openbsd-ee878cc78cf8e9e0f30af77478e0bd0c1dfc703f.zip | |
when doing user mounts, inherit the MNT_NOEXEC flag from the covered
vnode's mount point. this makes it impossible for a user to bypass the
noexec protection of a mount point by null-mounting it on top of itself.
ok tedu@ millert@
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 0550ac520e6..5c3a10d593e 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_syscalls.c,v 1.109 2004/04/13 00:15:28 tedu Exp $ */ +/* $OpenBSD: vfs_syscalls.c,v 1.110 2004/05/10 22:36:21 pedro Exp $ */ /* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */ /* @@ -154,7 +154,8 @@ sys_mount(p, v, retval) } /* * Do not allow NFS export by non-root users. Silently - * enforce MNT_NOSUID and MNT_NODEV for non-root users. + * enforce MNT_NOSUID and MNT_NODEV for non-root users, and + * inherit MNT_NOEXEC from the mount point. */ if (p->p_ucred->cr_uid != 0) { if (SCARG(uap, flags) & MNT_EXPORTED) { @@ -162,6 +163,8 @@ sys_mount(p, v, retval) return (EPERM); } SCARG(uap, flags) |= MNT_NOSUID | MNT_NODEV; + if (flag & MNT_NOEXEC) + SCARG(uap, flags) |= MNT_NOEXEC; } if ((error = vfs_busy(mp, LK_NOWAIT, 0, p)) != 0) { vput(vp); @@ -182,7 +185,8 @@ sys_mount(p, v, retval) } /* * Do not allow NFS export by non-root users. Silently - * enforce MNT_NOSUID and MNT_NODEV for non-root users. + * enforce MNT_NOSUID and MNT_NODEV for non-root users, and inherit + * MNT_NOEXEC from the mount point. */ if (p->p_ucred->cr_uid != 0) { if (SCARG(uap, flags) & MNT_EXPORTED) { @@ -190,6 +194,8 @@ sys_mount(p, v, retval) return (EPERM); } SCARG(uap, flags) |= MNT_NOSUID | MNT_NODEV; + if (vp->v_mount->mnt_flag & MNT_NOEXEC) + SCARG(uap, flags) |= MNT_NOEXEC; } if ((error = vinvalbuf(vp, V_SAVE, p->p_ucred, p, 0, 0)) != 0) return (error); |