diff options
| author | jeff <jeff@FreeBSD.org> | 2005-05-03 16:24:59 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2005-05-03 16:24:59 +0000 |
| commit | 33ac8108e208b013f6a23863636e022de6effb3a (patch) | |
| tree | 5332097453bee9142d6e00d370493bfc89cacd30 | |
| parent | 3f28784d7025984ac5eae44e8228054a47ccea5d (diff) | |
| download | FreeBSD-src-33ac8108e208b013f6a23863636e022de6effb3a.zip FreeBSD-src-33ac8108e208b013f6a23863636e022de6effb3a.tar.gz | |
- Initialize vfslocked correctly early enough for MAC to compile.
- Fix one place where we explicitly drop Giant!
Pointy hat to: me
Submitted by: Max Laier
Warned by: Tinderbox
| -rw-r--r-- | sys/kern/kern_exec.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 2e13bb0..204b284 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -301,6 +301,7 @@ do_execve(td, args, mac_p) int will_transition; #endif + vfslocked = 0; imgp = &image_params; /* @@ -336,10 +337,8 @@ do_execve(td, args, mac_p) #ifdef MAC error = mac_execve_enter(imgp, mac_p); - if (error) { - mtx_lock(&Giant); + if (error) goto exec_fail; - } #endif imgp->image_header = NULL; @@ -353,7 +352,6 @@ do_execve(td, args, mac_p) UIO_SYSSPACE, args->fname, td); interpret: - vfslocked = 0; error = namei(ndp); if (error) goto exec_fail; @@ -440,6 +438,7 @@ interpret: vm_object_deallocate(imgp->object); imgp->object = NULL; VFS_UNLOCK_GIANT(vfslocked); + vfslocked = 0; /* set new name to that of the interpreter */ NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME | MPSAFE, UIO_SYSSPACE, imgp->interpreter_name, td); @@ -763,7 +762,7 @@ exec_fail: if (interplabel != NULL) mac_vnode_label_free(interplabel); #endif - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); exit1(td, W_EXITCODE(0, SIGABRT)); /* NOT REACHED */ error = 0; |
