From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Date: Fri, 26 Jan 2024 08:14:31 +0000 (+0300)
Subject: fs/ntfs3: Fixed overflow check in mi_enum_attr()
X-Git-Tag: v6.8-rc4~10^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=652cfeb43d6b9aba5c7c4902bed7a7340df131fb;p=thirdparty%2Fkernel%2Flinux.git

fs/ntfs3: Fixed overflow check in mi_enum_attr()

Reported-by: Robert Morris <rtm@csail.mit.edu>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
---

diff --git a/fs/ntfs3/record.c b/fs/ntfs3/record.c
index 7b6423584eaee..6aa3a9d44df1b 100644
--- a/fs/ntfs3/record.c
+++ b/fs/ntfs3/record.c
@@ -279,7 +279,7 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)
 		if (t16 > asize)
 			return NULL;
 
-		if (t16 + le32_to_cpu(attr->res.data_size) > asize)
+		if (le32_to_cpu(attr->res.data_size) > asize - t16)
 			return NULL;
 
 		t32 = sizeof(short) * attr->name_len;