8 files changed, 16 insertions, 16 deletions

diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index c04294e149b5c..b3a5f6505b865 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -2129,10 +2129,8 @@ mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred)
 {
 
 	/* XXX freeze all other threads */
-	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms_recurse(td, cred,
 	    &td->td_proc->p_vmspace->vm_map);
-	mtx_unlock(&Giant);
 	/* XXX allow other threads to continue */
 }
 
@@ -3043,7 +3041,9 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	crhold(newcred);
 	PROC_UNLOCK(p);
 
+	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms(td, newcred);
+	mtx_unlock(&Giant);
 
 	crfree(newcred);	/* Free revocation reference. */
 	crfree(oldcred);
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index c04294e149b5c..b3a5f6505b865 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -2129,10 +2129,8 @@ mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred)
 {
 
 	/* XXX freeze all other threads */
-	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms_recurse(td, cred,
 	    &td->td_proc->p_vmspace->vm_map);
-	mtx_unlock(&Giant);
 	/* XXX allow other threads to continue */
 }
 
@@ -3043,7 +3041,9 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	crhold(newcred);
 	PROC_UNLOCK(p);
 
+	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms(td, newcred);
+	mtx_unlock(&Giant);
 
 	crfree(newcred);	/* Free revocation reference. */
 	crfree(oldcred);
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index c04294e149b5c..b3a5f6505b865 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -2129,10 +2129,8 @@ mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred)
 {
 
 	/* XXX freeze all other threads */
-	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms_recurse(td, cred,
 	    &td->td_proc->p_vmspace->vm_map);
-	mtx_unlock(&Giant);
 	/* XXX allow other threads to continue */
 }
 
@@ -3043,7 +3041,9 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	crhold(newcred);
 	PROC_UNLOCK(p);
 
+	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms(td, newcred);
+	mtx_unlock(&Giant);
 
 	crfree(newcred);	/* Free revocation reference. */
 	crfree(oldcred);
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index c04294e149b5c..b3a5f6505b865 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -2129,10 +2129,8 @@ mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred)
 {
 
 	/* XXX freeze all other threads */
-	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms_recurse(td, cred,
 	    &td->td_proc->p_vmspace->vm_map);
-	mtx_unlock(&Giant);
 	/* XXX allow other threads to continue */
 }
 
@@ -3043,7 +3041,9 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	crhold(newcred);
 	PROC_UNLOCK(p);
 
+	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms(td, newcred);
+	mtx_unlock(&Giant);
 
 	crfree(newcred);	/* Free revocation reference. */
 	crfree(oldcred);
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index c04294e149b5c..b3a5f6505b865 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -2129,10 +2129,8 @@ mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred)
 {
 
 	/* XXX freeze all other threads */
-	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms_recurse(td, cred,
 	    &td->td_proc->p_vmspace->vm_map);
-	mtx_unlock(&Giant);
 	/* XXX allow other threads to continue */
 }
 
@@ -3043,7 +3041,9 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	crhold(newcred);
 	PROC_UNLOCK(p);
 
+	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms(td, newcred);
+	mtx_unlock(&Giant);
 
 	crfree(newcred);	/* Free revocation reference. */
 	crfree(oldcred);
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index c04294e149b5c..b3a5f6505b865 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -2129,10 +2129,8 @@ mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred)
 {
 
 	/* XXX freeze all other threads */
-	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms_recurse(td, cred,
 	    &td->td_proc->p_vmspace->vm_map);
-	mtx_unlock(&Giant);
 	/* XXX allow other threads to continue */
 }
 
@@ -3043,7 +3041,9 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	crhold(newcred);
 	PROC_UNLOCK(p);
 
+	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms(td, newcred);
+	mtx_unlock(&Giant);
 
 	crfree(newcred);	/* Free revocation reference. */
 	crfree(oldcred);
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index c04294e149b5c..b3a5f6505b865 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -2129,10 +2129,8 @@ mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred)
 {
 
 	/* XXX freeze all other threads */
-	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms_recurse(td, cred,
 	    &td->td_proc->p_vmspace->vm_map);
-	mtx_unlock(&Giant);
 	/* XXX allow other threads to continue */
 }
 
@@ -3043,7 +3041,9 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	crhold(newcred);
 	PROC_UNLOCK(p);
 
+	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms(td, newcred);
+	mtx_unlock(&Giant);
 
 	crfree(newcred);	/* Free revocation reference. */
 	crfree(oldcred);
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index c04294e149b5c..b3a5f6505b865 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -2129,10 +2129,8 @@ mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred)
 {
 
 	/* XXX freeze all other threads */
-	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms_recurse(td, cred,
 	    &td->td_proc->p_vmspace->vm_map);
-	mtx_unlock(&Giant);
 	/* XXX allow other threads to continue */
 }
 
@@ -3043,7 +3041,9 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
 	crhold(newcred);
 	PROC_UNLOCK(p);
 
+	mtx_lock(&Giant);
 	mac_cred_mmapped_drop_perms(td, newcred);
+	mtx_unlock(&Giant);
 
 	crfree(newcred);	/* Free revocation reference. */
 	crfree(oldcred);