diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2003-01-31 18:57:04 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2003-01-31 18:57:04 +0000 |
| commit | 7278944df10f758af36b29f156ef4a706133d58e (patch) | |
| tree | 617d31a18f34f2e5e55f73256d2eb7da0cf5f974 | |
| parent | f993880ae14b5eef434c3136b4a1c8afded9c18f (diff) | |
Notes
| -rw-r--r-- | sys/kern/vfs_extattr.c | 6 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 2fbdcfea9531..3752f0cb54f0 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -542,8 +542,10 @@ chroot(td, uap) if ((error = change_dir(&nd, td)) != 0) goto error; #ifdef MAC - if ((error = mac_check_vnode_chroot(td->td_ucred, nd.ni_vp))) + if ((error = mac_check_vnode_chroot(td->td_ucred, nd.ni_vp))) { + vput(vp); goto error; + } #endif FILEDESC_LOCK(fdp); if (chroot_allow_open_directories == 0 || @@ -567,7 +569,7 @@ error_unlock: FILEDESC_UNLOCK(fdp); error: mtx_unlock(&Giant); - NDFREE(&nd, 0); + NDFREE(&nd, NDF_ONLY_PNBUF); return (error); } diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 2fbdcfea9531..3752f0cb54f0 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -542,8 +542,10 @@ chroot(td, uap) if ((error = change_dir(&nd, td)) != 0) goto error; #ifdef MAC - if ((error = mac_check_vnode_chroot(td->td_ucred, nd.ni_vp))) + if ((error = mac_check_vnode_chroot(td->td_ucred, nd.ni_vp))) { + vput(vp); goto error; + } #endif FILEDESC_LOCK(fdp); if (chroot_allow_open_directories == 0 || @@ -567,7 +569,7 @@ error_unlock: FILEDESC_UNLOCK(fdp); error: mtx_unlock(&Giant); - NDFREE(&nd, 0); + NDFREE(&nd, NDF_ONLY_PNBUF); return (error); } |