mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
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: Abhijith Das <adas@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
acb57a3652
commit
acd2c8aa02
1 changed files with 9 additions and 6 deletions
|
@ -1237,14 +1237,17 @@ 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;
|
||||
gfs2_meta_syncfs(sdp);
|
||||
dput(sdp->sd_root_dir);
|
||||
dput(sdp->sd_master_dir);
|
||||
sdp->sd_root_dir = NULL;
|
||||
sdp->sd_master_dir = NULL;
|
||||
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);
|
||||
gfs2_delete_debugfs_file(sdp);
|
||||
if (sdp)
|
||||
gfs2_delete_debugfs_file(sdp);
|
||||
}
|
||||
|
||||
struct file_system_type gfs2_fs_type = {
|
||||
|
|
Loading…
Reference in a new issue