Minor code sync to MAC tree: push Giant locking up from

mac_cred_mmapped_drop_perms() to the caller.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, NAI Labs
This commit is contained in:
rwatson 2002-09-09 17:10:16 +00:00
parent 03b3b78217
commit bb15291772
9 changed files with 18 additions and 18 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);