ext4: fix null pointer dereference on sbi

In the case of a kzalloc failure when allocating sbi we end up
with a null pointer dereference on sbi when assigning sbi->s_daxdev.
Fix this by moving the assignment of sbi->s_daxdev to after the
null pointer check of sbi.

Detected by CoverityScan CID#1455379 ("Dereference before null check")

Fixes: 5e405595e5bf ("ext4: perform dax_device lookup at mount")
Signed-off-by: Colin Ian King <[email protected]>
Signed-off-by: Dan Williams <[email protected]>

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 3e58f952eddc0b45be3ade8fdba3df0189bda076..55772b2d05ee5a19d1bf5357c7288fc1925a338f 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3401,10 +3401,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
        unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO;
        ext4_group_t first_not_zeroed;
 
-       sbi->s_daxdev = dax_dev;
        if ((data && !orig_data) || !sbi)
                goto out_free_base;
 
+       sbi->s_daxdev = dax_dev;
        sbi->s_blockgroup_lock =
                kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL);
        if (!sbi->s_blockgroup_lock)