Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50c00054 authored by Andrew Price's avatar Andrew Price Committed by Greg Kroah-Hartman
Browse files

gfs2: Don't leave s_fs_info pointing to freed memory in init_sbd 



commit 4c62bd9cea7bcf10292f7e4c57a2bca332942697 upstream.

When alloc_percpu() fails, sdp gets freed but sb->s_fs_info still points
to the same address. Move the assignment after that error check so that
s_fs_info can only point to a valid sdp or NULL, which is checked for
later in the error path, in gfs2_kill_super().

Reported-by: default avatar <syzbot+dcb8b3587445007f5808@syzkaller.appspotmail.com>
Signed-off-by: default avatarAndrew Price <anprice@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e044554e

fs/gfs2/ops_fstype.c

+1 −1
Original line number Diff line number Diff line
@@ -71,13 +71,13 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb) 
	if (!sdp)

		return NULL;



	sb->s_fs_info = sdp;

	sdp->sd_vfs = sb;

	sdp->sd_lkstats = alloc_percpu(struct gfs2_pcpu_lkstats);

	if (!sdp->sd_lkstats) {

		kfree(sdp);

		return NULL;

	}

	sb->s_fs_info = sdp;



	set_bit(SDF_NOJOURNALID, &sdp->sd_flags);

	gfs2_tune_init(&sdp->sd_tune);