diff options
| author | Colin Leroy <colin@colino.net> | 2005-05-30 16:01:58 +0200 |
|---|---|---|
| committer | Chris Wright <chrisw@osdl.org> | 2005-06-11 19:45:22 -0700 |
| commit | 08373277d66dd334de2e20cf05e85533aaccf257 (patch) | |
| tree | b5748acaa4d6f64a68436054fea7aa6f1b415bc0 | |
| parent | 839c2379a6ed8ea9dd669d4c3206b85c5dff674e (diff) | |
| download | linux-stable-08373277d66dd334de2e20cf05e85533aaccf257.tar.gz linux-stable-08373277d66dd334de2e20cf05e85533aaccf257.tar.bz2 linux-stable-08373277d66dd334de2e20cf05e85533aaccf257.zip | |
[PATCH] fix hfsplus oops, hfs and hfsplus leak
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. It's been included in 2.6.12-
rc4. See
http://www.kernel.org/git/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=945b092011c6af71a0107be96e119c8c08776f3f
(chrisw: backport to -stable)
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Colin Leroy <colin@colino.net>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/hfs/mdb.c | 5 +++++
fs/hfs/super.c | 8 +++-----
fs/hfsplus/super.c | 6 +++++-
3 files changed, 13 insertions(+), 6 deletions(-)
| -rw-r--r-- | fs/hfs/mdb.c | 5 | ||||
| -rw-r--r-- | fs/hfs/super.c | 8 | ||||
| -rw-r--r-- | fs/hfsplus/super.c | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/fs/hfs/mdb.c b/fs/hfs/mdb.c index 4efb640c4d0c..217e32f37e0b 100644 --- a/fs/hfs/mdb.c +++ b/fs/hfs/mdb.c @@ -333,6 +333,8 @@ void hfs_mdb_close(struct super_block *sb) * Release the resources associated with the in-core MDB. */ void hfs_mdb_put(struct super_block *sb) { + if (!HFS_SB(sb)) + return; /* free the B-trees */ hfs_btree_close(HFS_SB(sb)->ext_tree); hfs_btree_close(HFS_SB(sb)->cat_tree); @@ -340,4 +342,7 @@ void hfs_mdb_put(struct super_block *sb) /* free the buffers holding the primary and alternate MDBs */ brelse(HFS_SB(sb)->mdb_bh); brelse(HFS_SB(sb)->alt_mdb_bh); + + kfree(HFS_SB(sb)); + sb->s_fs_info = NULL; } diff --git a/fs/hfs/super.c b/fs/hfs/super.c index 884aeace678d..5e640a9a11da 100644 --- a/fs/hfs/super.c +++ b/fs/hfs/super.c @@ -263,7 +263,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) res = -EINVAL; if (!parse_options((char *)data, sbi)) { hfs_warn("hfs_fs: unable to parse mount options.\n"); - goto bail3; + goto bail; } sb->s_op = &hfs_super_operations; @@ -276,7 +276,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_mdb_name(sb)); res = -EINVAL; - goto bail2; + goto bail; } /* try to get the root inode */ @@ -306,10 +306,8 @@ bail_iput: iput(root_inode); bail_no_root: hfs_warn("hfs_fs: get root inode failed.\n"); +bail: hfs_mdb_put(sb); -bail2: -bail3: - kfree(sbi); return res; } diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 09242d50096d..53caa3d4d4e7 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c @@ -207,7 +207,9 @@ static void hfsplus_write_super(struct super_block *sb) static void hfsplus_put_super(struct super_block *sb) { 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; vhdr->modify_date = hfsp_now2mt(); @@ -223,6 +225,8 @@ static void hfsplus_put_super(struct super_block *sb) iput(HFSPLUS_SB(sb).alloc_file); iput(HFSPLUS_SB(sb).hidden_dir); brelse(HFSPLUS_SB(sb).s_vhbh); + kfree(sb->s_fs_info); + sb->s_fs_info = NULL; } static int hfsplus_statfs(struct super_block *sb, struct kstatfs *buf) |