Home » Mailing list archives » linux-kernel » 2008 » September » 26

[PATCH 08/12] GFS2: GFS2 will panic if you misspell any mount options

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Steven Whitehouse
Subject: [PATCH 08/12] GFS2: GFS2 will panic if you misspell any mount options
Date: Friday, September 26, 2008 - 5:00 am

From: Abhijith Das <adas@redhat.com>

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>

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index a6225cc..ae35f09 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 = {
-- 
1.5.5.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
GFS2: Pre-pull patch posting, Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 01/12] GFS2: Fix debugfs glock file iterator, Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 02/12] GFS2: Fix metafs mounts, Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 03/12] GFS2: rm on multiple nodes causes panic, Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 04/12] GFS2: Fix &amp; clean up GFS2 rename, Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 05/12] GFS2: Fix race relating to glock min-hold time, Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 06/12] GFS2: Use an IS_ERR test rather than a NULL test, Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 07/12] GFS2: Direct IO write at end of file error, Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 08/12] GFS2: GFS2 will panic if you misspell any mo ..., Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 09/12] GFS2: The war on bloat, Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 10/12] GFS2: high time to take some time over atime, Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 11/12] GFS2: Add UUID to GFS2 sb, Steven Whitehouse, (Fri Sep 26, 5:00 am)
[PATCH 12/12] GFS2: Support for I/O barriers, Steven Whitehouse, (Fri Sep 26, 5:00 am)