From nobody Tue Nov 17 17:04:05 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 4jTWKf4NfZz71Qvt for ; Tue, 17 Nov 2026 17:04:06 +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 4jTWKd73hfz4FC0 for ; Tue, 17 Nov 2026 17:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935046; 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=MYoVNqlXuCQmj33/RckXKGdb7HEi51j4Eltl2D8taw0=; b=vaMbjh7IuXD1r+Mk1hVEVJoONGsoCixpHgmDxh/BpfUD2mjk8szoZPDohM4TnMALpMBNBd 4Zz+kX4NelUGQtnfFTNH9hmbzkNPri+z7FFKfmZF0jVQT63FrkYeGTgWmlvRgVdBI66L5T OOaEzxBWFB/+LBMODX13V3hq8f84FfokuzIEOXPmz4c3fgD3/PuwSVrsk/nAoRrwfQKB1l xz/wkRBOwbQ37g52p6lslClbebgCqDem5CcINUF5Nd6+/W4L/7Ff4Qv6SHcpYMKsPIUOXm ZZdjiNgXtFwvif3A7HksF81YoK7VkJJHbDjvIecQpX4lRZBBcEtL0HAhfe+aug== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935046; b=MJpSnSW3HTmf8IHvdIdoPdvic8bA7aDFikJhhgyRKGpvoYedW7t9RImlvtVPNNlUcdEI+g /S5hHXJ91ddEsP+o63fqm+pt1/RfR6+r92U2svjmgQlUOsIhuF7I3bxbQmDUdtJl1XCdua GHUmCRs3ZIBI0K15+E+L6R+1SxE87BTg02uwXIka6DD0y3CHVFWwpszkTLOWdOGCo8dw0c Gh3uFRmtfexKyXvymoXoW+4FTfaRGKT+1bml6lKmwRNrPk7CCa0xryXfdebArUeRIscVWU jbHShpVkjkGn80thW7kFEyf3082HJFBHAhAomrj9GpgTz9lGC/QfHLdJu0yXeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935046; 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=MYoVNqlXuCQmj33/RckXKGdb7HEi51j4Eltl2D8taw0=; b=HaG+A3xKX9TG1ce6VeyZFeyd0MXDlw2QJBFH0qZD4PXtMUT08LLX3XEsQ+pUuH7IZSm5wO o6DDAKFyEvD0O+n8Y+FuAIZUzBhdpySQiYKtEXLWA7fXBvgrFI6mMRPUf3C5ThBhhtyQbv GvZLjCsH4gneVSHtL4SxfsRL+1AH4gfBvwAc5WpDngI5VvXkTXZXUpCqX5zhIQIeXsvd1O UVqBZ/P8V4QzcxgmsntFeowP6U/B7Pbvx9uuYFtYgLt+yOHq31gkMctOiCDcnanMWXxY7p uPZL0XKZJHIJNzwDNYwV9Y16y93aW8ILUVUoYsAuN8SuQl9uWOyoSXY4VP97cA== 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 4jTWKd5sSNzrYj for ; Tue, 17 Nov 2026 17:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ea57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:04:05 +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: 06a0f9a66be0 - releng/14.4 - 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/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 06a0f9a66be035100928ed4459a07b91a49c6190 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:04:05 +0000 Message-Id: <6afc8905.1ea57.549fbcb@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=06a0f9a66be035100928ed4459a07b91a49c6190 commit 06a0f9a66be035100928ed4459a07b91a49c6190 Author: Nick Price AuthorDate: 2026-11-08 01:32:08 +0000 Commit: Mark Johnston CommitDate: 2026-11-15 15:48:01 +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. Approved by: so Security: CVE-2026-101314 Security: FreeBSD-SA-26:75.linux 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) (cherry picked from commit fd57277fc3c25e6656a23810387b6aa111c5a2cd) --- 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 6979fff9c82d..c66339b9b348 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);