From nobody Thu Oct 23 04:37:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csYCv556gz6Dcwq; Thu, 23 Oct 2025 04:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csYCv4cN8z46mJ; Thu, 23 Oct 2025 04:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761194235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3FZqjJDBToH/+rocFHRQST36hnDVch3JOdKuyt4jQ9I=; b=Nbe11y0K7zKyhe9LWk2oOqr4gyZ9u9MQUxDZXs4/wfAFE1RWYggJ3d6pK9dN3zROoscn4T sy/H9CdjKEEIxopZy4vHQq7qo/ZQRIgWRb5DnQHzJzDuWX6imWDFNXyeKd5SQSQx9YS/g2 ciey8toRTXNHoDtJ8zaUlAtrlyGEKAbLjxruil+6kWnOtVUFQ2YV+fiCTaZODdosFVPcHd Hnke4A54cXSKGyIE8yYEhgci/yAB3WAm+/L/TxGreQULoFjS+O8mUUxXvXZSi4Kw9iTMbd SDBGXDEPI+Qc9YJq8uEPzrYHeYFJkixaSo/iVPyvD8qK5ayaHAMTw8kQOkXzIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761194235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3FZqjJDBToH/+rocFHRQST36hnDVch3JOdKuyt4jQ9I=; b=JXFg1oFZ1Q2pJFdFxlkRcZISYjUGqhfbEuU6q6OkVXO9h2gs2nETb0IS8LipCJ1umJfKHO VxW5hoYGXOCUoPb9sGCfNEnZ5TniGi/eOFjxOOm6CbP+Mke/yV4F2ps3b9HxaTylJq91CB IhAdngpKKhxspWeUQi7YUCCHAbWPixC0H2t6qt5P5uj3hT2F6Z8xEarlKJUSK5a8jo9Y+d K2wqZinwsnDl/cdDp/1IF7QCVcbtvM8+srUsV9n9oAPpY2+/aD4BzOGKIHb2zrPGA58aWO rTQdKe13Eg8O4wliNbauajG/AEgey7GDVCxdL5cOMa6kPxnXciqsROex371Y0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761194235; a=rsa-sha256; cv=none; b=nXzF70ze7KlsL50S2+IACHsAAkp0eINRvoR9RdEK6ABxBPfRScwPTjYvTCJ41gEyMhzACK 0onfoMw9Lwab2IQwAdi+Sd2d88LtOmAOyl5QvJyrd+x9tNuSOOspJMhLdDMvm6qY0CjROB pHrCMaOWDGZuEsOd181LXSDnzXF/xtIFqoq5MBWbiN5nb+OB29irdcpEF/6EyFVP9Q+S20 BcWhb2NJRBeOGEYIypRN4f2zzA7eNn73I/udj0+N1Zjl/eJ5DLTV0DtuR6JtLXV8UIjUqH QdAnCHp35QTt2Peq89KmDUDQfxZRKkK37OVRf7jeFB2aCouZwmmJ4PdgTEUpRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csYCv3sNCz10J1; Thu, 23 Oct 2025 04:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59N4bFVP076247; Thu, 23 Oct 2025 04:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N4bF4d076244; Thu, 23 Oct 2025 04:37:15 GMT (envelope-from git) Date: Thu, 23 Oct 2025 04:37:15 GMT Message-Id: <202510230437.59N4bF4d076244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 2d3c6a06edc3 - stable/15 - jail: fix a regression that creates zombies when removing dying jails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2d3c6a06edc3919455d1152f4ffaa60697e2c4f2 Auto-Submitted: auto-generated The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=2d3c6a06edc3919455d1152f4ffaa60697e2c4f2 commit 2d3c6a06edc3919455d1152f4ffaa60697e2c4f2 Author: Jamie Gritton AuthorDate: 2025-10-20 16:49:14 +0000 Commit: Jamie Gritton CommitDate: 2025-10-23 04:37:01 +0000 jail: fix a regression that creates zombies when removing dying jails When adding jail descriptors, I split sys_jail remove in two, and didn't properly track jail held between them when a jail was dying. This fixes that as well as cleaning up the logic behind it. PR: 290217 Reported by: David 'equinox' Lamparter Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53200 (cherry picked from commit 78f70d4ff9dd4af2318b25023a7f55be7402ec60) --- sys/kern/kern_jail.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 3697d95fe0e5..00732d55cd46 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2909,12 +2909,6 @@ prison_remove(struct prison *pr) { 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 @@ prison_deref(struct prison *pr, int flags) /* 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. */