From nobody Tue Jun 30 17:21:21 2026 X-Original-To: dev-commits-src-all@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 4gqVLB157jz6jYYc for ; Tue, 30 Jun 2026 17:21:22 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqVL965pgz3rdv for ; Tue, 30 Jun 2026 17:21:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a0/4j0+QjMZFkRjJMFc5wMejhLZe8i1zbkYas6Z9tVs=; b=qC7icv8Bkb2IZL+pFPGTwyxp6WsAHDjW2Dq4bTesGQrdTJgDW70+nJqwAfvxPgxUCXnzT7 ozCxvdpH8QF7twqH9g0q1K0pNe4Zw+fTi7wjRbPxFMdKru1BzEOPv4R/H/WyuusNm1SZFT HDdYvsZ0YNRkoi9GG5VRCqj/sZFMRkcmjrLjSPPZvvh0I/Zdn2W8uO6+J4ZiXgF1jTiWCr NFj+AD3fAhfEgd+ya1oZHZeGwp2iMA7dHwTq96mnoLmUJQyilAgVlIZjM76TGEgaqz9eHT DdunpptOTGiFwg6/JRdz7cMl20W/tgZZs9vnT23+IoM3OEfCCMlbrXHIjKPL7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840081; a=rsa-sha256; cv=none; b=P8o2ZcHZ+cDRJndlwNBDdG3sqNdT5UU+avuwwFdHteDoP23PZrCtGYNd9KUs1u6ksRsd8L xgWiszQm3hR/UnHSz9Adzhas4gFAa1sTWCmXdlFdpeF/AtgaGQlJnkXVGlIxrExmU5vO3K +p7rgpKlkuUlfyimCq3t4Wje8slpwK4q814DR7895+t7Ed9BEpXsiy9l6S+hG2IcfhB+Dp h6lRAXngyY9l5rUMJ+GTSZINRz9pb4rGBpJ+1OAwN3+FBwZ9boOL6E7F2xbLBTgL1MeVHY FX5ZwRh58bglgGUQOFyqzjmMYsNEmfdOl8MDQa7rKgxt4xUSMoHIOH5h/Kl0jQ== 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=1782840081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a0/4j0+QjMZFkRjJMFc5wMejhLZe8i1zbkYas6Z9tVs=; b=TL9jCVTMXjr1V/kXcB9rOdTpQWGpEddIk94HDvuJJQRkf/sDPJckdStWxduRtrSau0GOa9 AkY8cmldnMG5AUjBRdk2rVoDuj5TOkNkMxCt1Y3UUxChS5dWmg3Sq71w0qbeKmI+Xu1Sgq p2HuA53Xg8wUwV/82oTroXcuW+IRL7CoJCZYWlAfOPsH24gHKyLKX90R8wkb0viiDq65RB JNQ2xXyMgv1kVoJuugtKBFC5Z+kHNbdnEmfts/i4vFI5ZUJenrzfIPRGRIYlwlx3SDkSuL Bh1dokvhqXouKclGzlZDhMjBP5WxtRtyCiFxUi8Le8azyf89UHM6xfvJz4ULww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVL949H0ztjL for ; Tue, 30 Jun 2026 17:21:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4589a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:21:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jamie Gritton From: Mark Johnston Subject: git: 029528221261 - releng/15.0 - jail: Don't double-free the current prison in kern_jail_set/get List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 029528221261c56a5c6480e897c861fc91583315 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:21:21 +0000 Message-Id: <6a43fb11.4589a.14918014@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=029528221261c56a5c6480e897c861fc91583315 commit 029528221261c56a5c6480e897c861fc91583315 Author: Jamie Gritton AuthorDate: 2026-06-09 22:31:40 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 02:32:57 +0000 jail: Don't double-free the current prison in kern_jail_set/get Approved by: so Security: FreeBSD-SA-26:38.jail Security: CVE-2026-49419 Reported by: Yuxiang Yang, et al Discussed with: markj (cherry picked from commit b52dc2067618fc73e8d4d20e4035d1a67a8b455d) (cherry picked from commit 4938fd9361b497241df8f442f1f87cc73ef81d6c) --- 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 523b7e314a10..40b2d7a69e3e 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -1097,14 +1097,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; @@ -2545,14 +2548,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. */