OSDN Git Service

fs/ntfs3: Potential NULL dereference in hdr_find_split()
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 24 Aug 2021 07:50:15 +0000 (10:50 +0300)
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Fri, 27 Aug 2021 14:05:14 +0000 (17:05 +0300)
The "e" pointer is dereferenced before it has been checked for NULL.
Move the dereference after the NULL check to prevent an Oops.

Fixes: 82cae269cfa9 ("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>
fs/ntfs3/index.c

index 5fb41c9..f4729aa 100644 (file)
@@ -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;