FAILED: patch "[PATCH] xfs: check for buffer overruns when examining local/remote" failed to apply to 6.6-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 91c41f9524906a8ebd2ae68c98a07b4bd5255ddb
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026110428-companion-surround-cdb4@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 91c41f9524906a8ebd2ae68c98a07b4bd5255ddb Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <[email protected]>
Date: Mon, 12 Oct 2026 08:23:12 -0700
Subject: [PATCH] xfs: check for buffer overruns when examining local/remote
xattr entries
LOLLM noticed that the xattr scrub and repair code can walk off the end of the buffer if the xattr entry record starts so close to the end of the buffer that there's not even space for the entry structure itself. Strengthen the bounds checking here.
fs/xfs/scrub/attr.c +12 -0
@@ -306,6 +306,12 @@ xchk_xattr_local_entry(char *name_end;unsigned int namesize; + name_end = (char *)lentry + offsetof(typeof(*lentry), nameval[0]); +if (name_end > buf_end) { +xchk_da_set_corrupt (ds, level); +return 0 ; + } + namesize =xfs_attr_leaf_entsize_local (lentry->namelen,be16_to_cpu (lentry->valuelen)); name_end = (char *)lentry + namesize;
@@ -335,6 +341,12 @@ xchk_xattr_remote_entry(char *name_end;unsigned int namesize; + name_end = (char *)rentry + offsetof(typeof(*rentry), name[0]); +if (name_end > buf_end) { +xchk_da_set_corrupt (ds, level); +return 0 ; + } + namesize =xfs_attr_leaf_entsize_remote (rentry->namelen); name_end = (char *)rentry + namesize;if (rentry->namelen ==0 ) {
fs/xfs/scrub/attr_repair.c +14 -4
@@ -285,6 +285,7 @@ xrep_xattr_salvage_local_attr( struct xfs_attr_leaf_name_local *lentry) {struct xchk_xattr_buf *ab = rx->sc->buf; +char *name_end;unsigned char *value;unsigned int valuelen;unsigned int namesize;
@@ -293,10 +294,14 @@ xrep_xattr_salvage_local_attr(* Decode the leaf local entry format. If something seems wrong, we * junk the attribute. */ + name_end = (char *)lentry + offsetof(typeof(*lentry), nameval[0]); +if (name_end > buf_end) +return 0 ; value = &lentry->nameval[lentry->namelen]; valuelen =be16_to_cpu (lentry->valuelen); namesize =xfs_attr_leaf_entsize_local (lentry->namelen, valuelen); -if ((char *)lentry + namesize > buf_end) + name_end = (char *)lentry + namesize; +if (name_end > buf_end)return 0 ;if (!xrep_xattr_want_salvage (rx, ent->flags, lentry->nameval, lentry->namelen, value, valuelen))
@@ -333,8 +338,8 @@ xrep_xattr_salvage_remote_attr( .attr_filter = ent->flags & XFS_ATTR_NSP_ONDISK_MASK, .namelen = rentry->namelen, .name = rentry->name, - .valuelen = be32_to_cpu(rentry->valuelen), }; +char *name_end;unsigned int namesize;int error;
@@ -343,9 +348,14 @@ xrep_xattr_salvage_remote_attr(* junk the attribute. Note that we should never find a zero-length * remote attribute value. */ - namesize =xfs_attr_leaf_entsize_remote (rentry->namelen); -if ((char *)rentry + namesize > buf_end) + name_end = (char *)rentry + offsetof(typeof(*rentry), name[0]); +if (name_end > buf_end)return 0 ; + namesize =xfs_attr_leaf_entsize_remote (rentry->namelen); + name_end = (char *)rentry + namesize; +if (name_end > buf_end) +return 0 ; + args.valuelen =be32_to_cpu (rentry->valuelen);if (args.valuelen ==0 || !xrep_xattr_want_salvage (rx, ent->flags, rentry->name, rentry->namelen,NULL , args.valuelen))
Sasha Levin
maintainerPATCH 1/1 xfs: check for buffer overruns when examining local/remote xattr entries
From: "Darrick J. Wong" <[email protected]>
[ Upstream commit 91c41f9524906a8ebd2ae68c98a07b4bd5255ddb ]
LOLLM noticed that the xattr scrub and repair code can walk off the end of the buffer if the xattr entry record starts so close to the end of the buffer that there's not even space for the entry structure itself. Strengthen the bounds checking here.
--- fs/xfs/scrub/attr.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
fs/xfs/scrub/attr.c +12 -0
@@ -334,6 +334,12 @@ xchk_xattr_entry(/* Check the name information. */ if (ent->flags &XFS_ATTR_LOCAL ) { lentry =xfs_attr3_leaf_name_local (leaf, idx); + name_end = (char *)lentry + offsetof(typeof(*lentry), nameval[0]); +if (name_end > buf_end) { +xchk_da_set_corrupt (ds, level); +return ; + } + namesize =xfs_attr_leaf_entsize_local (lentry->namelen,be16_to_cpu (lentry->valuelen)); name_end = (char *)lentry + namesize;
@@ -341,6 +347,12 @@ xchk_xattr_entry(xchk_da_set_corrupt (ds, level); }else { rentry =xfs_attr3_leaf_name_remote (leaf, idx); + name_end = (char *)rentry + offsetof(typeof(*rentry), name[0]); +if (name_end > buf_end) { +xchk_da_set_corrupt (ds, level); +return ; + } + namesize =xfs_attr_leaf_entsize_remote (rentry->namelen); name_end = (char *)rentry + namesize;if (rentry->namelen ==0 )
Signature · 1 line
2.53.0