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

Commit acd2c8aa authored by Abhijith Das's avatar Abhijith Das Committed by Steven Whitehouse
Browse files

GFS2: GFS2 will panic if you misspell any mount options 



The gfs2 superblock pointer is NULL after a failed mount. When control
eventually goes to gfs2_kill_sb, we dereference this NULL pointer. This
patch ensures that the gfs2 superblock pointer is not NULL before being
dereferenced in gfs2_kill_sb.

Signed-off-by: default avatarAbhijith Das <adas@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent acb57a36

fs/gfs2/ops_fstype.c

+9 −6
Original line number Diff line number Diff line
@@ -1237,13 +1237,16 @@ static int gfs2_get_sb_meta(struct file_system_type *fs_type, int flags, 
static void gfs2_kill_sb(struct super_block *sb)

{

	struct gfs2_sbd *sdp = sb->s_fs_info;

	if (sdp) {

		gfs2_meta_syncfs(sdp);

		dput(sdp->sd_root_dir);

		dput(sdp->sd_master_dir);

		sdp->sd_root_dir = NULL;

		sdp->sd_master_dir = NULL;

	}

	shrink_dcache_sb(sb);

	kill_block_super(sb);

	if (sdp)

		gfs2_delete_debugfs_file(sdp);

}