From nobody Sun Nov 09 00:36:22 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 4d3v464dDGz6Ft26; Sun, 09 Nov 2025 00:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3v463hnVz3RFg; Sun, 09 Nov 2025 00:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648582; 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=L5+l+QWNX9vrWTtw+7k3GG7JJ3oWwzBXoU1C/LNORRY=; b=xqSclE/bQEwnN4TMwJ+qCte96xVnG5NeUZp/VrQ9pQD4oDUL0iZcsh8QiC67/CaAtBc0k3 OCzKybIYnXcq1pSVYpBbxG2avRLCa/u5XlparJ0+c6vtIHjJY4UNAjF0S9loa5MEHP4pUH f7HpzA2Gv1fACL9cH/DV0O3qR38z2Yq5x9HiDjMTF4NsrKv7ke0TXKwrUGmnYCdmo0u/gT +F5kNFxXHJj1rosK/7w/TtpzUa1B/t6jG56HD19TbkLCCPZka6jwuN14CU+CUl7MjaSHdn 5bm6NVqfufXUd3n0zQAR95kP/81bNIg4bAp8S/mrGzqHemEvhRsBkIhdsBkEuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648582; 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=L5+l+QWNX9vrWTtw+7k3GG7JJ3oWwzBXoU1C/LNORRY=; b=fyciJsftw3BD3Rtg4N43E+Ms7BZHn7u75oeWWwhCG+JAtPP7PRy7B47Fc9wUUDCZbO5wFN oDLvl6asT5sd9QsujACir7hoV14Wm/Vck3EPOy/DDrXnfPHQXiYSyPM+L0uPTGHRnXDSuC 9uE4C2o5Jea++EaA9ERX9nTamJFmEIG3Nx7EChMkEVwNLxPqv/2223jgsI1yH4LqV0jQxa XJahJNZSDv2qEmnn8NMZMk7dRdaVZ2dYntOxscrWL5LnjgJCtEug3UvrHhBPtXNhaZDOCo 9l8z36D0+cCNSBR0c4sTcisauPu8b/XOLArYalylRcFL32qwsbFiSP7Ukz5QiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762648582; a=rsa-sha256; cv=none; b=wIROx5o+iyBL9Rn4ug6DxvjgDUB6vp8Q+2GgUyE8CUYfk2lHlnU5Xc/VzxSjYobhuVK0Ft OSmiFwUxUwdy1EOCnN5pfwJTDZYpuEl9PgMt/0uU4sRxLpv5c8Rf45fpTauXTmjdlNjn2t uso4QgJcUoV/cpuq4LciAS7xO/kKDcQFWKqmMzBxm1MF26CMqGjJjgudD+OOT8bdV0c2ck 4J7kWMS83Ts/Sp+jWvOeeq9p9NuWRXGb/V1jiuqHKlR/5NeL0j/mN6QjzH65U+XFHcaL9Y HfdB7Har9S3sQIjoH+28lycA3qO9siU0cmU8wImzOZfcqQgLM2c0BMLmJrhrYw== 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 4d3v4634rbz17T1; Sun, 09 Nov 2025 00:36:22 +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 5A90aMVG096888; Sun, 9 Nov 2025 00:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A90aMd5096885; Sun, 9 Nov 2025 00:36:22 GMT (envelope-from git) Date: Sun, 9 Nov 2025 00:36:22 GMT Message-Id: <202511090036.5A90aMd5096885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7a9378856ae0 - stable/15 - kern_jail_set(): do not double-free opts 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7a9378856ae0b20e4d7330ab67cf02880db69afe Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7a9378856ae0b20e4d7330ab67cf02880db69afe commit 7a9378856ae0b20e4d7330ab67cf02880db69afe Author: Konstantin Belousov AuthorDate: 2025-11-06 05:50:42 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-09 00:35:52 +0000 kern_jail_set(): do not double-free opts (cherry picked from commit 3f5f52216f7e583aeb5580b13ba0f87e29d1ee43) --- sys/kern/kern_jail.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 523b7e314a10..26a994ef0c32 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -1065,8 +1065,10 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) * than duplicate it under a different name. */ error = vfs_buildopts(optuio, &opts); - if (error) + if (error) { + opts = NULL; goto done_free; + } cuflags = flags & (JAIL_CREATE | JAIL_UPDATE); if (!cuflags) { @@ -2331,7 +2333,8 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) (void)kern_close(td, jfd_out); if (g_path != NULL) free(g_path, M_TEMP); - vfs_freeopts(opts); + if (opts != NULL) + vfs_freeopts(opts); prison_free(mypr); return (error); }