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:
Abhijith Das 2008-09-15 08:54:06 -05:00 committed by Steven Whitehouse
parent acb57a3652
commit acd2c8aa02

View file

@ -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) 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;
gfs2_meta_syncfs(sdp); if (sdp) {
dput(sdp->sd_root_dir); gfs2_meta_syncfs(sdp);
dput(sdp->sd_master_dir); dput(sdp->sd_root_dir);
sdp->sd_root_dir = NULL; dput(sdp->sd_master_dir);
sdp->sd_master_dir = NULL; sdp->sd_root_dir = NULL;
sdp->sd_master_dir = NULL;
}
shrink_dcache_sb(sb); shrink_dcache_sb(sb);
kill_block_super(sb); kill_block_super(sb);
gfs2_delete_debugfs_file(sdp); if (sdp)
gfs2_delete_debugfs_file(sdp);
} }
struct file_system_type gfs2_fs_type = { struct file_system_type gfs2_fs_type = {