Skip to content

Commit 8e7e27b

Browse files
henryZeaalexandrovich
authored andcommitted
fs/ntfs3: fix panic about slab-out-of-bounds caused by ntfs_list_ea()
Here is a BUG report about linux-6.1 from syzbot, but it still remains within upstream: BUG: KASAN: slab-out-of-bounds in ntfs_list_ea fs/ntfs3/xattr.c:191 [inline] BUG: KASAN: slab-out-of-bounds in ntfs_listxattr+0x401/0x570 fs/ntfs3/xattr.c:710 Read of size 1 at addr ffff888021acaf3d by task syz-executor128/3632 Call Trace: kasan_report+0x139/0x170 mm/kasan/report.c:495 ntfs_list_ea fs/ntfs3/xattr.c:191 [inline] ntfs_listxattr+0x401/0x570 fs/ntfs3/xattr.c:710 vfs_listxattr fs/xattr.c:457 [inline] listxattr+0x293/0x2d0 fs/xattr.c:804 path_listxattr fs/xattr.c:828 [inline] __do_sys_llistxattr fs/xattr.c:846 [inline] Before derefering field members of `ea` in unpacked_ea_size(), we need to check whether the EA_FULL struct is located in access validate range. Similarly, when derefering `ea->name` field member, we need to check whethe the ea->name is located in access validate range, too. Fixes: be71b5c ("fs/ntfs3: Add attrib operations") Reported-by: syzbot+9fcea5ef6dc4dc72d334@syzkaller.appspotmail.com Signed-off-by: Zeng Heng <zengheng4@huawei.com> [almaz.alexandrovich@paragon-software.com: took the ret variable out of the loop block] Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
1 parent 9c689c8 commit 8e7e27b

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

fs/ntfs3/xattr.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,19 @@ static ssize_t ntfs_list_ea(struct ntfs_inode *ni, char *buffer,
211211
size = le32_to_cpu(info->size);
212212

213213
/* Enumerate all xattrs. */
214-
for (ret = 0, off = 0; off < size; off += ea_size) {
214+
ret = 0;
215+
for (off = 0; off + sizeof(struct EA_FULL) < size; off += ea_size) {
215216
ea = Add2Ptr(ea_all, off);
216217
ea_size = unpacked_ea_size(ea);
217218

218219
if (!ea->name_len)
219220
break;
220221

221222
if (buffer) {
223+
/* Check if we can use field ea->name */
224+
if (off + ea_size > size)
225+
break;
226+
222227
if (ret + ea->name_len + 1 > bytes_per_buffer) {
223228
err = -ERANGE;
224229
goto out;

0 commit comments

Comments
 (0)