diff options
| author | rwatson <rwatson@FreeBSD.org> | 2002-08-19 15:28:39 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2002-08-19 15:28:39 +0000 |
| commit | 8c753954cb572774dc4cb1a9d123a2e07021c128 (patch) | |
| tree | 0e1b7021542779221d19b2a6e207fe83ff2e44c8 /sys/security | |
| parent | 021687d79bc8e849306f5ba49fd033a75b39c1ad (diff) | |
| download | FreeBSD-src-8c753954cb572774dc4cb1a9d123a2e07021c128.zip FreeBSD-src-8c753954cb572774dc4cb1a9d123a2e07021c128.tar.gz | |
Add a missing vnode assertion for the exec() check.
Obtained from: TrustedBSD Project
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'sys/security')
| -rw-r--r-- | sys/security/mac/mac_framework.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_internal.h | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_net.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_pipe.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_process.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_syscalls.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_system.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_vfs.c | 2 |
8 files changed, 16 insertions, 0 deletions
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index c3d6dbf..abda929 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -1677,6 +1677,8 @@ mac_check_vnode_exec(struct ucred *cred, struct vnode *vp) { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_exec"); + if (!mac_enforce_process && !mac_enforce_fs) return (0); diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index c3d6dbf..abda929 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -1677,6 +1677,8 @@ mac_check_vnode_exec(struct ucred *cred, struct vnode *vp) { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_exec"); + if (!mac_enforce_process && !mac_enforce_fs) return (0); diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index c3d6dbf..abda929 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -1677,6 +1677,8 @@ mac_check_vnode_exec(struct ucred *cred, struct vnode *vp) { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_exec"); + if (!mac_enforce_process && !mac_enforce_fs) return (0); diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index c3d6dbf..abda929 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -1677,6 +1677,8 @@ mac_check_vnode_exec(struct ucred *cred, struct vnode *vp) { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_exec"); + if (!mac_enforce_process && !mac_enforce_fs) return (0); diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index c3d6dbf..abda929 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -1677,6 +1677,8 @@ mac_check_vnode_exec(struct ucred *cred, struct vnode *vp) { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_exec"); + if (!mac_enforce_process && !mac_enforce_fs) return (0); diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index c3d6dbf..abda929 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -1677,6 +1677,8 @@ mac_check_vnode_exec(struct ucred *cred, struct vnode *vp) { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_exec"); + if (!mac_enforce_process && !mac_enforce_fs) return (0); diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index c3d6dbf..abda929 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -1677,6 +1677,8 @@ mac_check_vnode_exec(struct ucred *cred, struct vnode *vp) { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_exec"); + if (!mac_enforce_process && !mac_enforce_fs) return (0); diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index c3d6dbf..abda929 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -1677,6 +1677,8 @@ mac_check_vnode_exec(struct ucred *cred, struct vnode *vp) { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_exec"); + if (!mac_enforce_process && !mac_enforce_fs) return (0); |
