From nobody Thu Nov 12 19:15:40 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 4jQVTm41WWz716Fx for ; Thu, 12 Nov 2026 19:15:40 +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 4jQVTm3JnJz4twf for ; Thu, 12 Nov 2026 19:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794510940; 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=H4CQwFG5pqhgD0R/SPui6OTuBE6OKaaSkftwxCLTgdg=; b=agnr0K7lGksmrORQ76cF3oXFdzYGJ/fOK2jLKTxDNyFawhZnf1icL2IJ4ubC3tcLUmueap HXeqBYXoviY2mVAHZKJofUGzVpJVMDBPQ5R1lOo4dMwvRrLpREinRckZDBwyCn2CC7mupn XcvVctjBwnJbsXAOWa7uQQ4vvJkcURqG7ZIjT8UMicTpXiGgQQ+w7wYaQC0Odmt2rYWdzu 7E8Lm4oJtmx4TrQU8B5zP8MxJG8PZwirHvxtozZOSFrgNb7l38pqyzWgpyhDY0O2xzHtLM rKpmS5w1/DMxi/Lj9y/hiBc9ag2VjUIzQE3cWWgu30F/IyLBDxTXUtjkxanKfw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794510940; b=Ght2UXWZmO0Estgj8KlDEiba9VUCFs/+zI4NGimIwxcf5qXLdeEPodmJUCObsHMbE4cSoA H0mN08jn6+suAaUJBarMKWRh5BraFiCshWA5aT/WolXqxRqRnX+eMKGd5dQGN0yJAsvg43 a7Y5+OWXmDN5yEAoJ5pDDRgCRx9mdEmUlkSWqVJC0WnWhI+IdnmAuSl7DlfEJJRKwtLwNr ly7hyEMweKkTKARrQ4s9xSO+uA+tCMedqCR0LYe6W78jlj96zvwrb9LC8vmiqu1D5sG/y9 oPqdNy6FEygsgn7iQ7DDZbzLJRb4evxn2UFLqxgfMgfTDNCxeWqHP/9izqb96g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794510940; 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=H4CQwFG5pqhgD0R/SPui6OTuBE6OKaaSkftwxCLTgdg=; b=yjv8aBLX41AKA67IizTBbwa9tyDR879F1wPgCtuheSSuezZlm22PmLOIBPc1gukcdtYm4y m4xcgn1NgcXzrdqhqK++2yeYjpyVjMKXDuxb8SScyCMOwSQHhscX7n1eTl3B7H84c4lV50 tVYevOc+6f26ZKjDlkm258CvDrcdxHlbApXx0/IJKOipSO3jkL5DjZ/OEzO24uX+4iaN5X aaHwDJfX5efrnKfyI1YeXP9hAHIpJ3r14qHE91468fF0vBBUxOHmJMjrqJu5T6gq8oO/26 accu9wGGdIZSmCaNw7aogyV5YDmFo7IMUM6KuyfbfjQbX+SE/OFLIhOi0KK0fQ== 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 4jQVTm2yWRz1F5Q for ; Thu, 12 Nov 2026 19:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 14483 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 19:15:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Nick Price From: Mark Johnston Subject: git: a46d6ae4c0b6 - stable/15 - linux: do not truncate the listxattr() size 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a46d6ae4c0b6f6e8eb74b13da6f607d2ead74be7 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 19:15:40 +0000 Message-Id: <6af6105c.14483.2738f01d@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a46d6ae4c0b6f6e8eb74b13da6f607d2ead74be7 commit a46d6ae4c0b6f6e8eb74b13da6f607d2ead74be7 Author: Nick Price AuthorDate: 2026-11-08 01:32:08 +0000 Commit: Mark Johnston CommitDate: 2026-11-12 19:15:13 +0000 linux: do not truncate the listxattr() size listxattr() sized its buffer with min(), which truncates the 64-bit size to 32 bits, so a size of 2^32 + k allocated k bytes while the copy-out guard used the full size. The walk then read record lengths past the buffer and copied kernel heap out to the caller, and could panic the kernel. Any user can reach it through a user.* attribute on a file it owns. Use MIN(), and fail with EIO if a record runs past the data returned. Reviewed by: adrian, markj Approved by: adrian (mentor) Differential Revision: https://reviews.freebsd.org/D61006 Signed-off-by: Nick Price (cherry picked from commit fbe4835e6b1eec36103a5ce97efbab11b3b5fc72) --- sys/compat/linux/linux_xattr.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 2eec33f8ef93..267cadedb986 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -139,7 +139,7 @@ listxattr(struct thread *td, struct listxattr_args *args) int attrnamespace, error; if (args->size != 0) - sz = min(LINUX_XATTR_LIST_MAX, args->size); + sz = MIN(LINUX_XATTR_LIST_MAX, args->size); else sz = LINUX_XATTR_LIST_MAX; @@ -189,6 +189,13 @@ listxattr(struct thread *td, struct listxattr_args *args) error = ERANGE; break; } + KASSERT(keylen + 1 <= rs, + ("%s: truncated record", __func__)); + if (keylen + 1 > rs) { + printf("%s: truncated record\n", __func__); + error = EIO; + goto out; + } ++key; if (args->list != NULL && args->size > 0) { sprintf(attrname, "%s.%.*s", prefix, keylen, key); @@ -201,6 +208,7 @@ listxattr(struct thread *td, struct listxattr_args *args) rs -= (keylen + 1); } } +out: if (error == 0) td->td_retval[0] = cnt; free(data, M_LINUX);