Skip to content

Commit

Permalink
fs/ntfs3: Potential NULL dereference in hdr_find_split()
Browse files Browse the repository at this point in the history
The "e" pointer is dereferenced before it has been checked for NULL.
Move the dereference after the NULL check to prevent an Oops.

Fixes: 82cae26 ("fs/ntfs3: Add initialization of super block")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Kari Argillander <kari.argillander@gmail.com>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
  • Loading branch information
Dan Carpenter authored and xanmod committed Aug 31, 2021
1 parent df5d9bb commit ecda7a7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/ntfs3/index.c
Expand Up @@ -557,11 +557,12 @@ static const struct NTFS_DE *hdr_find_split(const struct INDEX_HDR *hdr)
size_t o;
const struct NTFS_DE *e = hdr_first_de(hdr);
u32 used_2 = le32_to_cpu(hdr->used) >> 1;
u16 esize = le16_to_cpu(e->size);
u16 esize;

if (!e || de_is_last(e))
return NULL;

esize = le16_to_cpu(e->size);
for (o = le32_to_cpu(hdr->de_off) + esize; o < used_2; o += esize) {
const struct NTFS_DE *p = e;

Expand Down

0 comments on commit ecda7a7

Please sign in to comment.