Commit 8b0d5226 authored by Konstantin Komarov's avatar Konstantin Komarov Committed by Zheng Yejian
Browse files

fs/ntfs3: Fixed overflow check in mi_enum_attr() 

mainline inclusion
from mainline-v6.8-rc4
commit 652cfeb43d6b9aba5c7c4902bed7a7340df131fb
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9Q8M4
CVE: CVE-2024-27407

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



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

Reported-by: default avatarRobert Morris <rtm@csail.mit.edu>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Conflicts:
	fs/ntfs3/record.c
[Resolve conflicts due to several refactor patches not merged]
Signed-off-by: default avatarZheng Yejian <zhengyejian1@huawei.com>
parent f300accf

fs/ntfs3/record.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr) 
			return NULL;



		t32 = le32_to_cpu(attr->res.data_size);

		if (t16 + t32 > asize)

		if (t32 > asize - t16)

			return NULL;



		if (attr->name_len &&