fs/ntfs3: Fix a couple integer overflows on 32bit systems
[ Upstream commit 5ad414f4df2294b28836b5b7b69787659d6aa708 ]
On 32bit systems the "off + sizeof(struct NTFS_DE)" addition can
have an integer wrapping issue. Fix it by using size_add().
Fixes: 82cae269cf
("fs/ntfs3: Add initialization of super block")
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:
parent
1c80787ecd
commit
1a14e9718a
@ -617,7 +617,7 @@ static bool index_hdr_check(const struct INDEX_HDR *hdr, u32 bytes)
|
|||||||
u32 off = le32_to_cpu(hdr->de_off);
|
u32 off = le32_to_cpu(hdr->de_off);
|
||||||
|
|
||||||
if (!IS_ALIGNED(off, 8) || tot > bytes || end > tot ||
|
if (!IS_ALIGNED(off, 8) || tot > bytes || end > tot ||
|
||||||
off + sizeof(struct NTFS_DE) > end) {
|
size_add(off, sizeof(struct NTFS_DE)) > end) {
|
||||||
/* incorrect index buffer. */
|
/* incorrect index buffer. */
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -736,7 +736,7 @@ fill_table:
|
|||||||
if (end > total)
|
if (end > total)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (off + sizeof(struct NTFS_DE) > end)
|
if (size_add(off, sizeof(struct NTFS_DE)) > end)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
e = Add2Ptr(hdr, off);
|
e = Add2Ptr(hdr, off);
|
||||||
|
Loading…
Reference in New Issue
Block a user