summaryrefslogtreecommitdiffstats
path: root/fs/ntfs3
diff options
context:
space:
mode:
authorKonstantin Komarov <almaz.alexandrovich@paragon-software.com>2022-10-11 19:15:28 +0200
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>2022-11-14 17:50:48 +0100
commit60ce8dfde03558bfc290cd915c60fa243ba2ae84 (patch)
tree38b979283a1ff7e31a6f86b1a1602d3eb53e5ffc /fs/ntfs3
parentfs/ntfs3: Use ALIGN kernel macro (diff)
downloadlinux-60ce8dfde03558bfc290cd915c60fa243ba2ae84.tar.xz
linux-60ce8dfde03558bfc290cd915c60fa243ba2ae84.zip
fs/ntfs3: Fix wrong if in hdr_first_de
We need to check used bytes instead of total. Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Diffstat (limited to 'fs/ntfs3')
-rw-r--r--fs/ntfs3/ntfs.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ntfs3/ntfs.h b/fs/ntfs3/ntfs.h
index 9f764bf4ed0a..86ea1826d099 100644
--- a/fs/ntfs3/ntfs.h
+++ b/fs/ntfs3/ntfs.h
@@ -714,12 +714,13 @@ static inline struct NTFS_DE *hdr_first_de(const struct INDEX_HDR *hdr)
{
u32 de_off = le32_to_cpu(hdr->de_off);
u32 used = le32_to_cpu(hdr->used);
- struct NTFS_DE *e = Add2Ptr(hdr, de_off);
+ struct NTFS_DE *e;
u16 esize;
- if (de_off >= used || de_off >= le32_to_cpu(hdr->total))
+ if (de_off >= used || de_off + sizeof(struct NTFS_DE) > used )
return NULL;
+ e = Add2Ptr(hdr, de_off);
esize = le16_to_cpu(e->size);
if (esize < sizeof(struct NTFS_DE) || de_off + esize > used)
return NULL;