diff mbox series

[12/14] fs/ntfs3: Fix wrong if in hdr_first_de

Message ID ffaff797-0424-5aef-6ad7-d7e999f83198@paragon-software.com (mailing list archive)
State New, archived
Headers show
Series fs/ntfs3: Additional bugfix and refactoring | expand

Commit Message

Konstantin Komarov Oct. 28, 2022, 5:07 p.m. UTC 
We need to check used bytes instead of total.

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
---
  fs/ntfs3/ntfs.h | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

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;