diff options
author | rwatson <rwatson@FreeBSD.org> | 2006-06-05 22:36:12 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2006-06-05 22:36:12 +0000 |
commit | abd422e295102647c16d45e6a4bb13d1659dfbc0 (patch) | |
tree | 7477249b272c2a313ecbf9aad25ea017998eb23d /sys | |
parent | 196848bce4b05a26d26f39ae273039732ae68168 (diff) | |
download | FreeBSD-src-abd422e295102647c16d45e6a4bb13d1659dfbc0.zip FreeBSD-src-abd422e295102647c16d45e6a4bb13d1659dfbc0.tar.gz |
Remove use of Giant around vn_open() in audit trail setup.
Submitted by: jhb, wsalamon
Obtained from: TrustedBSD Project
Diffstat (limited to 'sys')
-rw-r--r-- | sys/security/audit/audit_syscalls.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/sys/security/audit/audit_syscalls.c b/sys/security/audit/audit_syscalls.c index c5be11a..8bd6ccb 100644 --- a/sys/security/audit/audit_syscalls.c +++ b/sys/security/audit/audit_syscalls.c @@ -30,6 +30,7 @@ */ #include <sys/param.h> +#include <sys/mount.h> #include <sys/namei.h> #include <sys/proc.h> #include <sys/sysproto.h> @@ -520,7 +521,7 @@ auditctl(struct thread *td, struct auditctl_args *uap) struct ucred *cred; struct vnode *vp; int error = 0; - int flags; + int flags, vfslocked; error = suser(td); if (error) @@ -539,25 +540,21 @@ auditctl(struct thread *td, struct auditctl_args *uap) if (uap->path == NULL) return (EINVAL); - /* - * XXXAUDIT: Giant may no longer be required here. - */ - mtx_lock(&Giant); - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, td); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE, UIO_USERSPACE, + uap->path, td); flags = AUDIT_OPEN_FLAGS; error = vn_open(&nd, &flags, 0, -1); - if (error) { - mtx_unlock(&Giant); - goto err_out; - } + if (error) + return (error); + vfslocked = NDHASGIANT(&nd); VOP_UNLOCK(nd.ni_vp, 0, td); vp = nd.ni_vp; if (vp->v_type != VREG) { vn_close(vp, AUDIT_CLOSE_FLAGS, td->td_ucred, td); - mtx_unlock(&Giant); - error = EINVAL; - goto err_out; + VFS_UNLOCK_GIANT(vfslocked); + return (EINVAL); } + VFS_UNLOCK_GIANT(vfslocked); cred = td->td_ucred; crhold(cred); @@ -567,10 +564,8 @@ auditctl(struct thread *td, struct auditctl_args *uap) */ audit_suspended = 0; - mtx_unlock(&Giant); audit_rotate_vnode(cred, vp); -err_out: return (error); } |