Commit 318949c5 authored by Zeng Heng's avatar Zeng Heng Committed by Baokun Li
Browse files

ntfs: Fix panic about slab-out-of-bounds caused by ntfs_listxattr() 

mainline inclusion
from mainline-v6.5-rc1
commit 3c675ddf
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9E2O5
CVE: CVE-2023-52640

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3c675ddffb17a8b1e32efad5c983254af18b12c2



--------------------------------

Here is a BUG report from syzbot:

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:
 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

Fix the logic of ea_all iteration. When the ea->name_len is 0,
return immediately, or Add2Ptr() would visit invalid memory
in the next loop.

Fixes: be71b5cb ("fs/ntfs3: Add attrib operations")
Reported-by: default avatar <syzbot+9fcea5ef6dc4dc72d334@syzkaller.appspotmail.com>
Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
[almaz.alexandrovich@paragon-software.com: lines of the patch have changed]
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
parent 6014fe24

fs/ntfs3/xattr.c

+3 −0
Original line number Diff line number Diff line
@@ -213,6 +213,9 @@ static ssize_t ntfs_list_ea(struct ntfs_inode *ni, char *buffer, 
		ea = Add2Ptr(ea_all, off);

		ea_size = unpacked_ea_size(ea);



		if (!ea->name_len)

			break;



		if (buffer) {

			if (ret + ea->name_len + 1 > bytes_per_buffer) {

				err = -ERANGE;