From nobody Tue Jun 30 17:21:54 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 4gqVLp3dtgz6jYp0 for ; Tue, 30 Jun 2026 17:21:54 +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 4gqVLp1x5Pz3sRp for ; Tue, 30 Jun 2026 17:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840114; 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=+/k4B2whyRFwzCm+JERrp4hFbJR0eRUTiJyEtxuEZtc=; b=G0Zs/FWIFP0PQTJqvOSRqt1VUmuAos3MlRzFzVaY94CihbM4EvzZd2B3mHlEiI92Vz1YaV QF5kzqjqk6kcrHAOd/TcdZEACnjHa1/y/uamFvrsb6Q8bzRSy4WiLXB3ZxWsjRuPLqvNie eDe4pEVq/igyMGyNB5aPbDOvnnxjNmnX/iIEfArpZxRAnNylqj87vGhWi2O8zEQwPopwsM rAw94LTLTXtwWAJmJ4ffPLteE4ggSpMS3BALGT2MkQEtGK7Y0PoaE42JgL5zcRoUUiuEgl MPkZVLE+71lZihhFl8LW9wSUNox0CzWTCIcIeeCENroG2xHYLL393BiJyr9O2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840114; a=rsa-sha256; cv=none; b=t/hnd/wUPFcYFxpgetEDSGsGVoFuoHy6zGJPMTt4qy5NAfDuarV7IgRedcwmVcuzh45GDk ln+k2v07QAU777kNASqlBejvn0Y8R0JCjqzypC7AsXAqFsPBiQ9pgFHGdWDO1AOgS1ZgWR BRdZ2Jh51PXdQo5YhqicPSS16r6bSf31qGbHp+7KGrtRojaYqZ/en7mXHnjZhULMl1eqXW hZyYhNtNK3xtX2tGMImSj14/f1wU4Cy+guJjYAchnw2qTJ4BvRUs0Y9RjC/jjhgppqNl+n 8xbrB9VoQ77wUClxfcGfMujZdJreCtVFcT+STbkC2ve65Tk6A2M4C0DpNuOIOA== 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=1782840114; 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=+/k4B2whyRFwzCm+JERrp4hFbJR0eRUTiJyEtxuEZtc=; b=DuGRG4lQcCbNqJxXRRT1JI7coIAwlu7bW/fAxU8ebnvYFOgR3RyYSuEBZxTi2fqlGux215 qGOvq8DjbBQ5i/noqZZsEE1IMc4k94I42M6Ojl+i6W6BjzuzSD53S9UaFObwzZN8GP+9B1 tobVa3XlFPNTlAhVfRgmhRt7fv1OCYN2lttDS6m8/wKu/hLb7QDRYU3C0qsNhZq3alzX9s /f+Wk1AP9wToFldsDmPaD0ojnoVxVAtlWfrgcUvEUYjiK95uoGxrtawaGNx7HFbFC14j9C 1dQuHN3LUp03ZSkVuuylvFMSWbgpR8NHQtyjQgtskWjkrK2gsTvxM0n4qgsoBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVLp0PW8ztYN for ; Tue, 30 Jun 2026 17:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45652 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:21:54 +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: fc9fe1b9f024 - releng/15.1 - 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.1 X-Git-Reftype: branch X-Git-Commit: fc9fe1b9f0240f8b7e74f9538f75bb070597b3c8 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:21:54 +0000 Message-Id: <6a43fb32.45652.7601c031@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fc9fe1b9f0240f8b7e74f9538f75bb070597b3c8 commit fc9fe1b9f0240f8b7e74f9538f75bb070597b3c8 Author: Jamie Gritton AuthorDate: 2026-06-09 22:31:40 +0000 Commit: Mark Johnston CommitDate: 2026-06-29 19:16:40 +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 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. */