]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
gfs2: check for empty rgrp tree in gfs2_ri_update
authorBob Peterson <rpeterso@redhat.com>
Tue, 24 Nov 2020 15:44:36 +0000 (10:44 -0500)
committerAndreas Gruenbacher <agruenba@redhat.com>
Wed, 25 Nov 2020 17:10:55 +0000 (18:10 +0100)
If gfs2 tries to mount a (corrupt) file system that has no resource
groups it still tries to set preferences on the first one, which causes
a kernel null pointer dereference. This patch adds a check to function
gfs2_ri_update so this condition is detected and reported back as an
error.

Reported-by: syzbot+e3f23ce40269a4c9053a@syzkaller.appspotmail.com
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
fs/gfs2/rgrp.c

index f7addc6197edeebf36a64d5d1a90f38febe439c9..5e8eef9990e326428d9c5e44ee19a5233029425f 100644 (file)
@@ -985,6 +985,10 @@ static int gfs2_ri_update(struct gfs2_inode *ip)
        if (error < 0)
                return error;
 
+       if (RB_EMPTY_ROOT(&sdp->sd_rindex_tree)) {
+               fs_err(sdp, "no resource groups found in the file system.\n");
+               return -ENOENT;
+       }
        set_rgrp_preferences(sdp);
 
        sdp->sd_rindex_uptodate = 1;