- The prison mutex cannot possibly protect pointers to the prison it

  protects, so don't bother locking it while we assign it to a ucred's
  cr_prison.
- Fully construct the new credential for a process before assigning it to
  p_ucred.

1 files changed, 1 insertions, 3 deletions

diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index c4b1c94..1dd019f 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -218,10 +218,8 @@ jail_attach(td, uap)
 	oldcred = p->p_ucred;
 	setsugid(p);
 	crcopy(newcred, oldcred);
+	newcred->cr_prison = pr;
 	p->p_ucred = newcred;
-	mtx_lock(&pr->pr_mtx);
-	p->p_ucred->cr_prison = pr;
-	mtx_unlock(&pr->pr_mtx);
 	PROC_UNLOCK(p);
 	crfree(oldcred);
 	return (0);