d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't lock the vnode around calls to vn_fullpath().

Browse Source 
Reviewed by:	csjp, rwatson
This commit is contained in:
John Baldwin 2008-11-04 22:30:24 +00:00
parent 203b82c842
commit 16da60664d
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/security/audit/audit_bsm_klib.c
View File

@ -492,7 +492,7 @@ audit_canon_path(struct thread *td, char *path, char *cpath)
char *rbuf, *fbuf, *copy;
struct filedesc *fdp;
struct sbuf sbf;
int error, cwir, locked;
int error, cwir;
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "%s: at %s:%d",
__func__, __FILE__, __LINE__);
@ -539,17 +539,8 @@ audit_canon_path(struct thread *td, char *path, char *cpath)
* in the future.
*/
if (rvnp != NULL) {
/*
* Although unlikely, it is possible for filesystems to define
* their own VOP_LOCK, so strictly speaking, we need to
* conditionally pickup Giant around calls to vn_lock(9)
*/
locked = VFS_LOCK_GIANT(rvnp->v_mount);
vn_lock(rvnp, LK_EXCLUSIVE | LK_RETRY);
vdrop(rvnp);
error = vn_fullpath_global(td, rvnp, &rbuf, &fbuf);
VOP_UNLOCK(rvnp, 0);
VFS_UNLOCK_GIANT(locked);
vdrop(rvnp);
if (error) {
cpath[0] = '\0';
if (cvnp != NULL)
@ -560,12 +551,8 @@ audit_canon_path(struct thread *td, char *path, char *cpath)
free(fbuf, M_TEMP);
}
if (cvnp != NULL) {
locked = VFS_LOCK_GIANT(cvnp->v_mount);
vn_lock(cvnp, LK_EXCLUSIVE | LK_RETRY);
vdrop(cvnp);
error = vn_fullpath(td, cvnp, &rbuf, &fbuf);
VOP_UNLOCK(cvnp, 0);
VFS_UNLOCK_GIANT(locked);
vdrop(cvnp);
if (error) {
cpath[0] = '\0';
return;