diff options
| author | Abhijith Das <adas@redhat.com> | 2008-09-15 08:54:06 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2008-09-15 16:08:32 +0100 |
| commit | acd2c8aa02f302ed838348052e16ee575c645147 (patch) | |
| tree | 2348e1103be0a2ada199b1b8bbac58bb646b5f57 /fs/gfs2 | |
| parent | acb57a3652c614efed26080dad5972c0076166b1 (diff) | |
| download | kernel_samsung_smdk4412-acd2c8aa02f302ed838348052e16ee575c645147.tar.gz kernel_samsung_smdk4412-acd2c8aa02f302ed838348052e16ee575c645147.tar.bz2 kernel_samsung_smdk4412-acd2c8aa02f302ed838348052e16ee575c645147.zip | |
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>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/ops_fstype.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index a6225cce2cb..ae35f097aa6 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -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 = { |