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

Commit 88a19ad0 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Fix use-after-free bug on umount (try #2) 



This should solve the issue with the previous attempt at fixing this.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent fefc03bf

fs/gfs2/ops_fstype.c

+12 −8
Original line number Diff line number Diff line
@@ -1263,17 +1263,21 @@ 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) {



	if (sdp == NULL) {

		kill_block_super(sb);

		return;

	}



	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);

	kfree(sdp);

}



struct file_system_type gfs2_fs_type = {

fs/gfs2/ops_super.c

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ static void gfs2_put_super(struct super_block *sb) 


	/*  At this point, we're through participating in the lockspace  */

	gfs2_sys_fs_del(sdp);

	kfree(sdp);

}



/**