From nobody Tue Nov 17 17:08:03 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 4jTWQC4Jz4z71SNV for ; Tue, 17 Nov 2026 17:08:03 +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 4jTWQC17Hxz4MfR for ; Tue, 17 Nov 2026 17:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935283; 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=gdLfImNUeZ41gSi/Zq6LxCxdeqIg6mbhNSvEEoneXwc=; b=HLLxxPuqjF69v6SsmplDkPeNUov4Ir742LtsMRhz91OtYuaqnnkX4aYRk+rcAmuEP1PH5G AK9DXVtmloXuverZDoB5G/3ggSOWlPFWAukcg7bdWaoQDQ/gDHW4rF7nhZk0V5xACmTaBp PaDYgV/s34M1snsFJtABT3Y+Rlx31JOuaJ7Zw6t2/0NyqWsUjnMjl0Oka48FtPVGhWCLXs KREJECccPvNQoVjvmHLTOW9z7j9PNrbEIT5WtugvHp2u1+RkFxO5Zl2mkubC9JBvm2z/I7 BRIhuxXLajkBYhI+/No0SRMZwwXXel3QJ9SHqYItQxVnmEtC2Flbyh4sQsOj/w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935283; b=dx6jlGM03yGUKshddI8GT54MljkmskTSMA1q7VJHgQEjZ8ZBFsQIb1oPRQsbzUmqLY0cjb ukBQF5iZH9oEl7y1u72dQniVPiNPW3YJLNqoBDDsF6oZ5jCJnVn92SubwzRnKuLNb3XmLJ JFna+wxbk0CQhP+ANPsIn1fflVLiF9KKGzpZJCmFs8jqWnHNXRhVULNssFIwVMnS57K2lZ 6ePcVbMLv5LhKJCl6nwvuRbJfRFc1N5fqQQ1lVHVUD6ZBLd93v9/+CIq9Lp3qbnBqZZeG5 U/TZZrFkNtbqHCo+133MfvqP87FrZLMN9jIuLFPgd/dUq2fvWP5C9djsdESjxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935283; 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=gdLfImNUeZ41gSi/Zq6LxCxdeqIg6mbhNSvEEoneXwc=; b=xg5QlcgQetN5ji1J3lPwhoFwIooLj8kCUZz0YdgkOR1EL8ywZNSbBtoXa+P6Amop2+goAJ VRWA0LeiqNVDLidYXaCEw+g5OO/lqMFrZ6QBfWg/oLmnCsItpcTotZi9Uis8jk3cm0h55k RzCI9fzy/BMjf/qnL2as8OaXjdaO1QXIydroaKgsXwRFfl9uR54KLnecfSub6Ex2O7yJBK /h9HRBuP2G8IIfA0AG6odG5R5vpqBhuO5gwJJf9s3Ch1K9EBVsWsX0fY1ENTkquiPY7Se4 hjy5EbnqNdZxEtLUI8B8t39mz8m0RYnYhhMsH12UXi00zR5usXQRsFwrqBnpIg== 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 4jTWQC0nlpzrvm for ; Tue, 17 Nov 2026 17:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ffbe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:08:03 +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: 52fe4ad71f4b - releng/15.1 - 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/15.1 X-Git-Reftype: branch X-Git-Commit: 52fe4ad71f4b36a477d89a7fb0c6da6f2f1e164a Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:08:03 +0000 Message-Id: <6afc89f3.1ffbe.76abad8b@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=52fe4ad71f4b36a477d89a7fb0c6da6f2f1e164a commit 52fe4ad71f4b36a477d89a7fb0c6da6f2f1e164a Author: Nick Price AuthorDate: 2026-11-08 01:32:08 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 01:38:09 +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: FreeBSD-SA-26:75.linux Security: CVE-2026-101314 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 a46d6ae4c0b6f6e8eb74b13da6f607d2ead74be7) --- 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);