mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
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: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
fefc03bfed
commit
88a19ad066
2 changed files with 12 additions and 9 deletions
|
@ -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)
|
static void gfs2_kill_sb(struct super_block *sb)
|
||||||
{
|
{
|
||||||
struct gfs2_sbd *sdp = sb->s_fs_info;
|
struct gfs2_sbd *sdp = sb->s_fs_info;
|
||||||
if (sdp) {
|
|
||||||
|
if (sdp == NULL) {
|
||||||
|
kill_block_super(sb);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
gfs2_meta_syncfs(sdp);
|
gfs2_meta_syncfs(sdp);
|
||||||
dput(sdp->sd_root_dir);
|
dput(sdp->sd_root_dir);
|
||||||
dput(sdp->sd_master_dir);
|
dput(sdp->sd_master_dir);
|
||||||
sdp->sd_root_dir = NULL;
|
sdp->sd_root_dir = NULL;
|
||||||
sdp->sd_master_dir = NULL;
|
sdp->sd_master_dir = NULL;
|
||||||
}
|
|
||||||
shrink_dcache_sb(sb);
|
shrink_dcache_sb(sb);
|
||||||
kill_block_super(sb);
|
kill_block_super(sb);
|
||||||
if (sdp)
|
|
||||||
gfs2_delete_debugfs_file(sdp);
|
gfs2_delete_debugfs_file(sdp);
|
||||||
|
kfree(sdp);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct file_system_type gfs2_fs_type = {
|
struct file_system_type gfs2_fs_type = {
|
||||||
|
|
|
@ -182,7 +182,6 @@ static void gfs2_put_super(struct super_block *sb)
|
||||||
|
|
||||||
/* At this point, we're through participating in the lockspace */
|
/* At this point, we're through participating in the lockspace */
|
||||||
gfs2_sys_fs_del(sdp);
|
gfs2_sys_fs_del(sdp);
|
||||||
kfree(sdp);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue