From nobody Thu Nov 12 14:25:14 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 4jQN2g05Qpz70hVn for ; Thu, 12 Nov 2026 14:25:15 +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 4jQN2f4dwlz4n2q for ; Thu, 12 Nov 2026 14:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794493514; 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=Ku3bBdjNhXygbU8X2A5yF7ZnJ6Vu0wsvayj3i5wK/C4=; b=q65K/icApqjE/9TipBN6ZNEp/oKVCijxc+307wKce424+P+oFPSrI4IRrc0I+3RjUqoJLa 2oP2j7qpWVPlZuLxeJkWza2LBjR2AinPSpesxuiVD0QewQ2/FkvqK9C61okxqtr/gZhMmQ U5BlzhMEgwcZbEPxFfa6aTtkVgdh0Y1GTeY7pTP7a1I2lXpqITZBmKqe1qQ/d2QLpVpvtt AnoEy7ZaAmkhziNdD7tX5JmBiMe5oIMkGeAvPRS/eZ4AZaXu1fQ0SRg27gzOrbnZo2TcPb 9mDkR5oQQdT6EQmIzU1uD5c1h2LyFe3wDm6xsQm/++xk9ZylclfcDnulwzrQNA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794493514; b=gsCtR37UPuhMHQO2mkrlWtSTIOj6iRA0iXu28/NbhRSoP4M5iuSqGq+P67Mx4ZIzte5xXh bGqfUSDYl98KUFxChZ4MlwqivWgr51qbANXbdO+V9SHOXtXMk8qVc7IRbVTrHqKBwsXOXI sDvIRcnnqlUJSQvAkAAvsm/DM8ZZ34DzK0iD+is6dcrvhUoVroMg7zdPlPJIOLZDZ84iEI OhXqGetwilpYfdYFaUDQZgCoMm1Ib/pfusadF6pd///lcoZLuRsuWYxrMx5BhdvwqVxaM7 DbTs0yCud9tcxjDVEyH1pJvo8xo/oKExX7yih/NZ7jVn4UIUZPwjpgn2Vr4PBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794493514; 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=Ku3bBdjNhXygbU8X2A5yF7ZnJ6Vu0wsvayj3i5wK/C4=; b=Q489k+Pt+iPkMGbmmCo72muwX/0nz34wusUjBnk6J76mZ5JKVH0SxoEDG0Qcx3dWMIN/7n 7ECLnirMiNVfeIJPbVfoo68j0+hX/p0H7yq1u0K18bxFdg3SwI0M972sehEASRtnS6nORt qH/Vi5cnD4HXdWEzMpjJWJTUCddvRNR/nIPYC4j0tjpHgLNAhd6ca1eWC6r+jEpie9FCaN X2ZFH9uhjoMooICZNHHKeufhSx657DYoLCC84WSdQXRyoa2pLXo4epJWGjXNA88u3COzpW XvCYtQkiokGs8Bsv5orcac7Sg1atvgaP8yJsxlI8DKX2G/9lg1B6wFrikNlhaQ== 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 4jQN2f3Q84z165t for ; Thu, 12 Nov 2026 14:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 15059 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 14:25:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Osvaldo Janeri Filho From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: e1b5e1f9ddac - main - 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/main X-Git-Reftype: branch X-Git-Commit: e1b5e1f9ddac43ed669a44cfdbba1b394d144c6b Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 14:25:14 +0000 Message-Id: <6af5cc4a.15059.27046691@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e1b5e1f9ddac43ed669a44cfdbba1b394d144c6b commit e1b5e1f9ddac43ed669a44cfdbba1b394d144c6b Author: Osvaldo Janeri Filho AuthorDate: 2026-11-12 14:23:56 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-12 14:24: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 --- 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;