D53200.id164628.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53200.id164628.diff
View Options

	diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
	--- a/sys/kern/kern_jail.c
	+++ b/sys/kern/kern_jail.c
	@@ -2909,12 +2909,6 @@
	{
	sx_assert(&allprison_lock, SA_XLOCKED);
	mtx_assert(&pr->pr_mtx, MA_OWNED);
	- if (!prison_isalive(pr)) {
	- /* Silently ignore already-dying prisons. */
	- mtx_unlock(&pr->pr_mtx);
	- sx_xunlock(&allprison_lock);
	- return;
	- }
	prison_deref(pr, PD_KILL \| PD_DEREF \| PD_LOCKED \| PD_LIST_XLOCKED);
	}

	@@ -3461,12 +3455,17 @@
	/* Kill the prison and its descendents. */
	KASSERT(pr != &prison0,
	("prison_deref trying to kill prison0"));
	- if (!(flags & PD_DEREF)) {
	- prison_hold(pr);
	- flags \|= PD_DEREF;
	+ if (!prison_isalive(pr)) {
	+ /* Silently ignore already-dying prisons. */
	+ flags &= ~PD_KILL;
	+ } else {
	+ if (!(flags & PD_DEREF)) {
	+ prison_hold(pr);
	+ flags \|= PD_DEREF;
	+ }
	+ flags = prison_lock_xlock(pr, flags);
	+ prison_deref_kill(pr, &freeprison);
	}
	- flags = prison_lock_xlock(pr, flags);
	- prison_deref_kill(pr, &freeprison);
	}
	if (flags & PD_DEUREF) {
	/* Drop a user reference. */