Commit 945b0920 authored by Colin Leroy's avatar Colin Leroy Committed by Linus Torvalds

[PATCH] hfs, hfsplus: don't leak s_fs_info and fix an oops

This patch fixes the leak of sb->s_fs_info in both the HFS and HFS+
modules.  In addition to this, it fixes an oops happening when trying to
mount a non-hfsplus filesystem using hfsplus.  This patch is from Roman
Zippel, based off patches sent by myself.
Signed-off-by: default avatarColin Leroy <colin@colino.net>
Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 954d3e95
...@@ -333,6 +333,8 @@ void hfs_mdb_close(struct super_block *sb) ...@@ -333,6 +333,8 @@ void hfs_mdb_close(struct super_block *sb)
* Release the resources associated with the in-core MDB. */ * Release the resources associated with the in-core MDB. */
void hfs_mdb_put(struct super_block *sb) void hfs_mdb_put(struct super_block *sb)
{ {
if (!HFS_SB(sb))
return;
/* free the B-trees */ /* free the B-trees */
hfs_btree_close(HFS_SB(sb)->ext_tree); hfs_btree_close(HFS_SB(sb)->ext_tree);
hfs_btree_close(HFS_SB(sb)->cat_tree); hfs_btree_close(HFS_SB(sb)->cat_tree);
...@@ -340,4 +342,7 @@ void hfs_mdb_put(struct super_block *sb) ...@@ -340,4 +342,7 @@ void hfs_mdb_put(struct super_block *sb)
/* free the buffers holding the primary and alternate MDBs */ /* free the buffers holding the primary and alternate MDBs */
brelse(HFS_SB(sb)->mdb_bh); brelse(HFS_SB(sb)->mdb_bh);
brelse(HFS_SB(sb)->alt_mdb_bh); brelse(HFS_SB(sb)->alt_mdb_bh);
kfree(HFS_SB(sb));
sb->s_fs_info = NULL;
} }
...@@ -297,7 +297,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -297,7 +297,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
res = -EINVAL; res = -EINVAL;
if (!parse_options((char *)data, sbi)) { if (!parse_options((char *)data, sbi)) {
hfs_warn("hfs_fs: unable to parse mount options.\n"); hfs_warn("hfs_fs: unable to parse mount options.\n");
goto bail3; goto bail;
} }
sb->s_op = &hfs_super_operations; sb->s_op = &hfs_super_operations;
...@@ -310,7 +310,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -310,7 +310,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
hfs_warn("VFS: Can't find a HFS filesystem on dev %s.\n", hfs_warn("VFS: Can't find a HFS filesystem on dev %s.\n",
hfs_mdb_name(sb)); hfs_mdb_name(sb));
res = -EINVAL; res = -EINVAL;
goto bail2; goto bail;
} }
/* try to get the root inode */ /* try to get the root inode */
...@@ -340,10 +340,8 @@ bail_iput: ...@@ -340,10 +340,8 @@ bail_iput:
iput(root_inode); iput(root_inode);
bail_no_root: bail_no_root:
hfs_warn("hfs_fs: get root inode failed.\n"); hfs_warn("hfs_fs: get root inode failed.\n");
bail:
hfs_mdb_put(sb); hfs_mdb_put(sb);
bail2:
bail3:
kfree(sbi);
return res; return res;
} }
......
...@@ -208,7 +208,9 @@ static void hfsplus_write_super(struct super_block *sb) ...@@ -208,7 +208,9 @@ static void hfsplus_write_super(struct super_block *sb)
static void hfsplus_put_super(struct super_block *sb) static void hfsplus_put_super(struct super_block *sb)
{ {
dprint(DBG_SUPER, "hfsplus_put_super\n"); dprint(DBG_SUPER, "hfsplus_put_super\n");
if (!(sb->s_flags & MS_RDONLY)) { if (!sb->s_fs_info)
return;
if (!(sb->s_flags & MS_RDONLY) && HFSPLUS_SB(sb).s_vhdr) {
struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr; struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr;
vhdr->modify_date = hfsp_now2mt(); vhdr->modify_date = hfsp_now2mt();
...@@ -226,6 +228,8 @@ static void hfsplus_put_super(struct super_block *sb) ...@@ -226,6 +228,8 @@ static void hfsplus_put_super(struct super_block *sb)
brelse(HFSPLUS_SB(sb).s_vhbh); brelse(HFSPLUS_SB(sb).s_vhbh);
if (HFSPLUS_SB(sb).nls) if (HFSPLUS_SB(sb).nls)
unload_nls(HFSPLUS_SB(sb).nls); unload_nls(HFSPLUS_SB(sb).nls);
kfree(sb->s_fs_info);
sb->s_fs_info = NULL;
} }
static int hfsplus_statfs(struct super_block *sb, struct kstatfs *buf) static int hfsplus_statfs(struct super_block *sb, struct kstatfs *buf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment