diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2008-01-17 15:21:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-17 15:38:58 -0800 |
| commit | 46a39c1cd5d2f804b27e9a4be3fb1b510dda9570 (patch) | |
| tree | 1f085f3303baa0f47feeb3b36d54e169bc5e210e /fs/hfs | |
| parent | 6915719b36a97d28fab576c6fa2a20364b435fe6 (diff) | |
| download | linux-stable-46a39c1cd5d2f804b27e9a4be3fb1b510dda9570.tar.gz linux-stable-46a39c1cd5d2f804b27e9a4be3fb1b510dda9570.tar.bz2 linux-stable-46a39c1cd5d2f804b27e9a4be3fb1b510dda9570.zip | |
hfs: fix coverity-found null deref
Fix potential null deref introduced by commit
cf0594625083111ae522496dc1c256f7476939c2
http://bugzilla.kernel.org/show_bug.cgi?id=9748
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Reported-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hfs')
| -rw-r--r-- | fs/hfs/btree.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c index 31284c77bba8..110dd3515dc8 100644 --- a/fs/hfs/btree.c +++ b/fs/hfs/btree.c @@ -61,7 +61,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke mapping = tree->inode->i_mapping; page = read_mapping_page(mapping, 0, NULL); if (IS_ERR(page)) - goto free_tree; + goto free_inode; /* Load the header */ head = (struct hfs_btree_header_rec *)(kmap(page) + sizeof(struct hfs_bnode_desc)); @@ -99,11 +99,12 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke page_cache_release(page); return tree; - fail_page: +fail_page: page_cache_release(page); - free_tree: +free_inode: tree->inode->i_mapping->a_ops = &hfs_aops; iput(tree->inode); +free_tree: kfree(tree); return NULL; } |