From nobody Fri May 29 15:20:34 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 4gRn9b3nG9z6fhPD for ; Fri, 29 May 2026 15:20:35 +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 4gRn9b0tp8z43qs for ; Fri, 29 May 2026 15:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780068035; 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=eGlgmtfGUEe4bmZD7+VATgzZSNjJtnXP+objNETAIsQ=; b=RAGRTfkPlQzjSI3PBbzdX5l+IHrFVRN50MRh5JTFgWd3C1S0rC9IHDbkGPWitGMuZKMdfg 8Qmf/k1XyDX31b777drV1jUV0mr+pW3ZylxMduPWAWJKc8nPs3P6nth7qHNQOm0RrqOjBe PUw8ja5V6JsYxxFG5cqs9MpxscJrcfnJFzHNvaqxpFriaik02JVGqHewYUEkbuC7lq9uc0 Lx1Pv2Pw0YoNyivej+eRAxW1qdxNlpchBXpuMZ5uLUcdaJ6Ge1fAnVuU60zgZ9jiRwikvs 2hiyZhI9Zw/Z7xeePbqBnUXVszG9msjqOa9Zdu5MEtGtY2FvbAvLep9pUHi0QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780068035; a=rsa-sha256; cv=none; b=bgAzoQEO8WMjVrdqDItT0Jqb5+hEFod9t5m9n0pgVPeNJmcYn4IkPnhdGA7MKbViYA16dd XdOZJFP6z9GUNjgRMafAI4ZkO7o+fPza8QTxtn5KwbjVWadzhGP/QOQYZlDhEC5LS5sO6c DIsnqnon87BPZeZHz4omqDP1URO+MtXU5BDYEhlVYE+XZgwG1qO8fGvlEhVCCi/OwU1Yuy xqyhLSv6fXJ5b+6tSP/KvRTcYtDpPi5nTAKI4p1woqRbxkgGvy30Vb6cwLDWWhidwqCldx vGqHnGenW8tWU96JoodnNElGCsCX0L5AsDw7YIsoShM1O4n2WukrIto69oZyog== 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=1780068035; 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=eGlgmtfGUEe4bmZD7+VATgzZSNjJtnXP+objNETAIsQ=; b=ms+vucMYjuOaj2DOSSchnhH/HXVTwdZBln0XrgBKWvS+zOu9D7NHA2Yey2jXY2Jjx6IGfL QhnH6jdL7bKUiZiAZ7tXrJfT5CHf5F+7/OEK5te5ogzemQ7IUwEOkjYjvmb6QqbUcwHrZh qfVuIsQc0pVw5QH+VbnLfQt7eHbnY/s6DFka5devZ7TNf4jSY9vqrgO/jqKOgCQY2i+4wS m2DCPjAeE5/ZEdct6etouipsQ0EmhQNBur7eJ1GCE/RlVT3fqSJ379BW2rowIli6SOqZmb uhntZtUbDN/lpm5j3PqhRdt8/gfdxXNz920VLBWE9JGVzLo2yaEkVMNa6QtjSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRn9Z5kflzfJm for ; Fri, 29 May 2026 15:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3006e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 15:20:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Shunchao Hu From: ShengYi Hung Subject: git: 4669f572f7f9 - stable/15 - compat/linprocfs: Fix auxv sbuf leak 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4669f572f7f9156d9d48ccab1a1309ec6d23a13a Auto-Submitted: auto-generated Date: Fri, 29 May 2026 15:20:34 +0000 Message-Id: <6a19aec2.3006e.16c71a7c@gitrepo.freebsd.org> The branch stable/15 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=4669f572f7f9156d9d48ccab1a1309ec6d23a13a commit 4669f572f7f9156d9d48ccab1a1309ec6d23a13a Author: Shunchao Hu AuthorDate: 2026-04-04 10:27:53 +0000 Commit: ShengYi Hung CommitDate: 2026-05-29 15:19:48 +0000 compat/linprocfs: Fix auxv sbuf leak linprocfs_doauxv() allocates an automatic sbuf before validating whether the requested read can be satisfied. When the computed auxv read length exceeds IOSIZE_MAX, or when the buffer length is too big, the function returns early without releasing the sbuf. Route these early exits through a shared cleanup path so the sbuf is always deleted after sbuf_new_auto() succeeds. Signed-off-by: Shunchao Hu Reviewed by: des, spmzt, zlei, aokblast MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/2118 (cherry picked from commit 16aa49f6d1bbe70cd3e851139eb63d566de49b12) --- sys/compat/linprocfs/linprocfs.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 7ac48786c77b..941b76788dc1 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -2026,23 +2026,26 @@ linprocfs_doauxv(PFS_FILL_ARGS) if (asb == NULL) return (ENOMEM); error = proc_getauxv(td, p, asb); - if (error == 0) - error = sbuf_finish(asb); + if (error != 0) + goto out; + error = sbuf_finish(asb); + if (error != 0) + goto out; resid = sbuf_len(asb) - uio->uio_offset; if (resid > uio->uio_resid) buflen = uio->uio_resid; else buflen = resid; - if (buflen > IOSIZE_MAX) - return (EINVAL); + if (buflen > IOSIZE_MAX) { + error = EINVAL; + goto out; + } if (buflen > maxphys) buflen = maxphys; - if (resid <= 0) - return (0); - - if (error == 0) + if (resid > 0) error = uiomove(sbuf_data(asb) + uio->uio_offset, buflen, uio); +out: sbuf_delete(asb); return (error); }