fs/ntfs3: Prevent integer overflow in hdr_first_de()
[ Upstream commit6bb81b94f7] The "de_off" and "used" variables come from the disk so they both need to check. The problem is that on 32bit systems if they're both greater than UINT_MAX - 16 then the check does work as intended because of an integer overflow. Fixes:60ce8dfde0("fs/ntfs3: Fix wrong if in hdr_first_de") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
0dfe700fbd
commit
f6d44b1aa4
+1
-1
@@ -717,7 +717,7 @@ static inline struct NTFS_DE *hdr_first_de(const struct INDEX_HDR *hdr)
|
||||
struct NTFS_DE *e;
|
||||
u16 esize;
|
||||
|
||||
if (de_off >= used || de_off + sizeof(struct NTFS_DE) > used )
|
||||
if (de_off >= used || size_add(de_off, sizeof(struct NTFS_DE)) > used)
|
||||
return NULL;
|
||||
|
||||
e = Add2Ptr(hdr, de_off);
|
||||
|
||||
Reference in New Issue
Block a user