From nobody Fri Jun 12 17:59:54 2026 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 4gcS2z0N1Vz6glNx for ; Fri, 12 Jun 2026 17:59:55 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gcS2y6R7Dz40Mh for ; Fri, 12 Jun 2026 17:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781287194; 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=MGZmeLoDswy/JIkBU3komu06tO53TxFj7g4B9xtxNdk=; b=NvQinumyQiyuVD2Umk1irnmtB+RMn1mTBLm8wtDFETLo7FHkMrFxicvSqv+bB37qz81kdA y9GN/9W192Ex2kYmARlxJBr37l5/S9pfrGELwXXqUUqr84vfqJM80o1RNsS/c7gbpiNi9s xovvD0GKIRstp0+BKhlXli5IVFi+AS4yKbDUHKSoNWrTBXEKk2W9gXkAfXMEQYHWpu9qWS iKlVKicdoWxX97H+bAPquBYucShWcPk6VgA3+BNsVK0s5pNjZoDBWLwgCckOF1yDsknEz9 ee45P896w/iuhk/jsSpKXmDgUr/sgJ347xJ4nKRxhVlHIPLrf4DgJhj3rUvoXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781287194; a=rsa-sha256; cv=none; b=VTCyNqoVLDwPc5Yvt8KSQDHbTTPwxdZCxwVtYvq8Ic+SHDEB/N9tIM9/5QP6ihUiyjoFky a69K95VzJz7fyF/wGVTnUHHwzWUNFnUTNf+sQE6+Ha686+E6oKqPFP3OTUZps6aST4hNfL ZMbeeZK0E00F0RKtAaUKQ73w86ImqAh/DZ0497u96Ww6Enl9Z2zeRTQawhIaYg08BbE/Hb xrew953bnJ5SBzLhpFJRBhxG/uIf9sTMQcdS1dv3Kud/Q2Hjch0YfIg2XhdHmSkZGoA6MZ wm93xR7ucOulolOZAUT+Jkq3JgruwAhJHF4J4FRE4DRVvkPLbCA182he26rgrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781287194; 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=MGZmeLoDswy/JIkBU3komu06tO53TxFj7g4B9xtxNdk=; b=HmzQ1WAEIx8P9zkPAJHEfwmnpj8pfqIyUyapmgZJ6PCc2FQwBtKVw0VMrxOWxP6tqpylCQ o4ra7nAajv3OHVQV7KeNrVuPQIZvZtY58Br1QEDmQvVp0RFcX8pxYB16xzLYeY4adf9qqT Z4Kfcg7NCAxbeToq6NzpDgyKxW9N15d4giSVk1GffRh+O1+MvNCUWWI49RRrz5lk/4cv28 t6nyCobLE8R5MRiGQUoOrrnHCFjoyfJnho3qgPeX2qHA5LKdmni5z7JDz716wyy7XJpb8t VXKuR0gisNML6pX8EBzA6YpJ60TXxBBWWQ5sTofSadZnNbL0Ry3eTy+fWe/hpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcS2y5lDzznXN for ; Fri, 12 Jun 2026 17:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41d9f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 12 Jun 2026 17:59:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 4938fd9361b4 - stable/15 - jail: Don't double-free the current prison in kern_jail_set/get 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 4938fd9361b497241df8f442f1f87cc73ef81d6c Auto-Submitted: auto-generated Date: Fri, 12 Jun 2026 17:59:54 +0000 Message-Id: <6a2c491a.41d9f.c5262ca@gitrepo.freebsd.org> The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=4938fd9361b497241df8f442f1f87cc73ef81d6c commit 4938fd9361b497241df8f442f1f87cc73ef81d6c Author: Jamie Gritton AuthorDate: 2026-06-09 22:31:40 +0000 Commit: Jamie Gritton CommitDate: 2026-06-12 17:57:44 +0000 jail: Don't double-free the current prison in kern_jail_set/get Reported by: Yuxiang Yang, et al Discussed with: markj (cherry picked from commit b52dc2067618fc73e8d4d20e4035d1a67a8b455d) --- sys/kern/kern_jail.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 9f6916a433a1..43acde461e40 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -1101,14 +1101,17 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) * Look up and create jails based on the * descriptor's prison. */ - prison_free(mypr); - error = jaildesc_find(td, jfd_in, &mypr, NULL); + struct prison *jdpr; + + error = jaildesc_find(td, jfd_in, &jdpr, NULL); if (error != 0) { vfs_opterror(opts, error == ENOENT ? "descriptor to dead jail" : "not a jail descriptor"); goto done_errmsg; } + prison_free(mypr); + mypr = jdpr; if ((flags & JAIL_CREATE) && mypr->pr_childmax == 0) { error = EPERM; goto done_free; @@ -2550,14 +2553,17 @@ kern_jail_get(struct thread *td, struct uio *optuio, int flags) } if (flags & JAIL_AT_DESC) { /* Look up jails based on the descriptor's prison. */ - prison_free(mypr); - error = jaildesc_find(td, jfd_in, &mypr, NULL); + struct prison *jdpr; + + error = jaildesc_find(td, jfd_in, &jdpr, NULL); if (error != 0) { vfs_opterror(opts, error == ENOENT ? "descriptor to dead jail" : "not a jail descriptor"); goto done; } + prison_free(mypr); + mypr = jdpr; } if (flags & (JAIL_GET_DESC | JAIL_OWN_DESC)) { /* Allocate a jail descriptor to return later. */