From nobody Thu Nov 06 19:32:32 2025 X-Original-To: dev-commits-src-main@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 4d2XQS5vrSz6FJkm; Thu, 06 Nov 2025 19:32:32 +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 4d2XQS5Jpfz47CL; Thu, 06 Nov 2025 19:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762457552; 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=lCnj2OjXoqAhKYmHToKA86lCUMrrhLQHWBtZEySRqLI=; b=icaLlA+L0zZB3MSY9WGj3WfibMLvyZbywz98WKIslnRDXzuxYu9WepApDThXliLhB9S+5y 5XUbnTXui1eRh2O9VmPcZMVHFKH+UObCh4QTowlSwL34n2f1WLvzDU7js5jqRYRK9xseR0 i7UbvuPuxuVow5e+ns2l0NKqCPKXpSVsrejY858IAx9cv8pRu/1+8WE8jo39rV8+Gazh7B PROoIz/ymdlm4Gk5iSvJX+ZEAo527Nk7aazf/bMbHleS3S75bNtFR5FTAXvpJxilb3Q12Z ALgGyu3LmBhNqig2B38ww4qQRyvP34KF1RnwKEN7cnuZrbkRHmomauL0lY2PaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762457552; 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=lCnj2OjXoqAhKYmHToKA86lCUMrrhLQHWBtZEySRqLI=; b=dxdXuqaiEnyYzNfqgYUqK4EJL+ypETIOGAPaZzQdfXnCLPtK0KYOD0Ks/d8lHA+8Oygx8L 33Fsh47n3E2zX6mheCVd7Qo8euCSN2h39QH0XdPOiZGl2rr9agnSduU41Qo0gRtw7yG4Dc 1cy5DnGjbdXrpXeJOVmEQ5m3cStUN7N7MyDmZsGgrR7bLP0SJsHoUmYMi5GVcBp6uiKUPb 0QMtzEYu/HZjxw2R23aorrz1ApwcRNWRdJdN3IIOKwBryaY0XIudpj1O8MYvGQIeBkwyTM 6jESVqsyHaNiIRi7B/M72e7y5ihh+m+42buqJe8znUn/6m1sdXp1apd+tfsmHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762457552; a=rsa-sha256; cv=none; b=yHXmooDq4hzX0O+Mhn/ytFrD2VtspIVDciV1q4l+WqPUSZQT2FV6JfEICG4RBlMmTJOfqg WRgjBaFSmZpJwunerKOiUQAkWXrc8aO9WmRibwZItFkms80tUN85MYNpHR5BOPC7YlILkV xWbIyqIe8Q4074Ql8d4jouK3EdF2sV+OzEFzEFf07LL+PPLeHHnGVtivpfdOAxYyAAxYi1 xoSiWdJUpYSvnFvcBioUZjOGQoefEf9kHBx3Q7eJquDaljT6/usiOtpJtNbfe7nVm3LYRy f7+P1tv6JyV1Urk4v+kjmg8dhVjWV1mOiSV2Sz3vXVDJn0Jc2litj1PstkNnRg== 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 4d2XQS4nl6zBck; Thu, 06 Nov 2025 19:32:32 +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 5A6JWWBb099224; Thu, 6 Nov 2025 19:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6JWWtj099221; Thu, 6 Nov 2025 19:32:32 GMT (envelope-from git) Date: Thu, 6 Nov 2025 19:32:32 GMT Message-Id: <202511061932.5A6JWWtj099221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3f5f52216f7e - main - kern_jail_set(): do not double-free opts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3f5f52216f7e583aeb5580b13ba0f87e29d1ee43 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3f5f52216f7e583aeb5580b13ba0f87e29d1ee43 commit 3f5f52216f7e583aeb5580b13ba0f87e29d1ee43 Author: Konstantin Belousov AuthorDate: 2025-11-06 05:50:42 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-06 19:32:16 +0000 kern_jail_set(): do not double-free opts If vfs_buildopts() failed, vfs_freeopts() must not be called. Reported and tested by: pho Reviewed by: jamie Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D53612 --- 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); }