[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20251108202545.1524330-2-rpthibeault@gmail.com>
Date: Sat, 8 Nov 2025 15:25:46 -0500
From: Raphael Pinsonneault-Thibeault <rpthibeault@...il.com>
To: tytso@....edu,
adilger.kernel@...ger.ca
Cc: cascardo@...lia.com,
linux-ext4@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-kernel-mentees@...ts.linux.dev,
skhan@...uxfoundation.org,
syzbot+3ee481e21fd75e14c397@...kaller.appspotmail.com,
Raphael Pinsonneault-Thibeault <rpthibeault@...il.com>
Subject: [PATCH] ext4: validate xattrs to avoid OOB in ext4_find_inline_entry
When looking for an entry in an inlined directory, if e_value_offs is
changed underneath the filesystem by some change in the block device, it
will lead to an out-of-bounds access that KASAN detects as a
use-after-free.
This is a similar problem as fixed by
commit c6b72f5d82b1 ("ext4: avoid OOB when system.data xattr changes underneath the filesystem")
whose fix was to call ext4_xattr_ibody_find() right after reading the
inode with ext4_get_inode_loc() to check the validity of the xattrs.
However, ext4_xattr_ibody_find() only checks xattr names, via
xattr_find_entry(), not e_value_offs.
Fix by calling xattr_check_inode() which performs a full check on the
xattrs in inode.
Reported-by: syzbot+3ee481e21fd75e14c397@...kaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=3ee481e21fd75e14c397
Tested-by: syzbot+3ee481e21fd75e14c397@...kaller.appspotmail.com
Fixes: c6b72f5d82b10 ("ext4: avoid OOB when system.data xattr changes underneath the filesystem")
Signed-off-by: Raphael Pinsonneault-Thibeault <rpthibeault@...il.com>
---
fs/ext4/inline.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 1b094a4f3866..7d46e1e16b52 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1593,6 +1593,13 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir,
down_read(&EXT4_I(dir)->xattr_sem);
+ if (EXT4_INODE_HAS_XATTR_SPACE(dir)) {
+ ret = xattr_check_inode(dir, IHDR(dir, ext4_raw_inode(&is.iloc)),
+ ITAIL(dir, ext4_raw_inode(&is.iloc)));
+ if (ret)
+ goto out;
+ }
+
ret = ext4_xattr_ibody_find(dir, &i, &is);
if (ret)
goto out;
--
2.43.0
Powered by blists - more mailing lists