From nobody Mon Nov 16 15:17:46 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 4jSs1Q4t0Kz70rHl for ; Mon, 16 Nov 2026 15:17:46 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jSs1Q1jkGz4R6W for ; Mon, 16 Nov 2026 15:17:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794842266; 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=8Mq0UtzyVysiFIxr1YzXQdNU2L8cezfLot5pFIM2FuA=; b=DaAyGFrBYrrt4V2bLa0hL7SxtfhJq5iVwQcsv/4AQsHu5L6LUZgukK1BXrMidQisiDtC9J eEXpCIODf9iswyPsGcQYjMpGvGiTh3zIl/Y12RJEOZ8NEHpLlKqyIOYCEVynKEz5NWIZrx 3tID2eOXuI38l8+i1e+6mRN/T8msi0oCcmyfShbrqlypbF7bxonzOy+Xp1UfwihXjbGrfp DyMFxA6PugksV/zB/+06EaoWo4DKXTb9MmnmPiwD3rGZLjDQeEqfchYKWLEpCrpUncrgqn 4OWjXH7cNVv/m+RDTPY/7SA180XVCueIj5LG2ONb/RIZFks5DgwPSFf6scl4Ag== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794842266; b=qIF9ZNThzZBkfpVQZU+Qbfrc9uFeyEwhzt2UWV6nMMxxbddkIen9f+Shz5YzoePzHH+XvM otV2dDbS1iNFUPTUvvqKvzjurGPKKSYW8NT/RR+IZYPQcBFfGG0xcDAqCzZzdqZE89aisa ZqLP8XJQfJY9kCstfLkbGlvu4VkxVGfa7E+LZLCx+SGsGUk+U8BGVb/o7G0Cds8GFQ4vLR lxHwM+0GeoXHqOol9KuqiTcz44HQzPLiZen7LTBW+O8qIk3tJxsmJRaUJyZ/BcIZ4HCiLF HG0TExuKGT4og6qBsI+rwG2rOIC99nwJZ6NkQe+XpQwNpR0v/1ghw+1nN+lU5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794842266; 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=8Mq0UtzyVysiFIxr1YzXQdNU2L8cezfLot5pFIM2FuA=; b=P83XO7Vffrm14AaXuw+NRQ5CPXALnUPx0Y86mak2/YY7Xx42Ig6n9vBf4RRfX+D6kfoH9R jp193EIiMJ5zLWnVYgiucnOnwHLafKNiJl19PcA7lMNUlDwhTiLg6PB6GwmhUM2m1UYCp3 Tav2N1TGjLw0eEaRBgMJGuNTErsPt2zUBOc6Gj1o3BdR4O97kBfcWEIw7o8T+zide2+sm6 Sd1nGB5DsiUkntbAHOXxhf6TxDnTkUvsIlJo1aunKuskDL/aEDHaUjGtzA6llxPbUlnz3O /gACthNBeMVxvVg5rzK19nxBl03eMrMRQ1+LKPFl471FL/uUxnsoqNJf7RbVPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jSs1Q0pY8z1039 for ; Mon, 16 Nov 2026 15:17:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3270 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 15:17:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Osvaldo Janeri Filho From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 0d8a925984d7 - stable/15 - su, login: fix heap over-read in environment export filter List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0d8a925984d70b8a3e2e1f8cd722afee2f967fe1 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 15:17:46 +0000 Message-Id: <6afb1e9a.3270.d44f40c@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0d8a925984d70b8a3e2e1f8cd722afee2f967fe1 commit 0d8a925984d70b8a3e2e1f8cd722afee2f967fe1 Author: Osvaldo Janeri Filho AuthorDate: 2026-11-12 14:23:56 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-16 14:52:03 +0000 su, login: fix heap over-read in environment export filter ok_to_export() (su.c) and export() (login.c) read s[n] before strncmp(s, *pp, n) confirms s is at least n bytes long, where n is the length of the blocked variable name. A PAM environment entry shorter than that name over-reads past its heap allocation. Check strncmp() first; it stops at s's NUL terminator and never reads past the boundary that guarded the s[n] access. MFC after: 1 week Sponsored by: Advanced Micro Devices, Inc. Signed-off-by: Osvaldo Janeri Filho Reviewed by: des, markj Differential Revision: https://reviews.freebsd.org/D61420 (cherry picked from commit e1b5e1f9ddac43ed669a44cfdbba1b394d144c6b) --- usr.bin/login/login.c | 2 +- usr.bin/su/su.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index 6a0c6a5b6bbc..e5a40b819833 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -797,7 +797,7 @@ export(const char *s) return (0); for (pp = noexport; *pp != NULL; pp++) { n = strlen(*pp); - if (s[n] == '=' && strncmp(s, *pp, n) == 0) + if (strncmp(s, *pp, n) == 0 && s[n] == '=') return (0); } *p = '\0'; diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c index 312a248b11f5..daf20c85d471 100644 --- a/usr.bin/su/su.c +++ b/usr.bin/su/su.c @@ -586,7 +586,7 @@ ok_to_export(const char *s) return 0; for (pp = noexport; *pp != NULL; pp++) { n = strlen(*pp); - if (s[n] == '=' && strncmp(s, *pp, n) == 0) + if (strncmp(s, *pp, n) == 0 && s[n] == '=') return 0; } return 1;