|
@@ -39,10 +39,16 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
|
|
|
goto free_tree;
|
|
|
tree->inode = inode;
|
|
|
|
|
|
+ if (!HFSPLUS_I(tree->inode)->first_blocks) {
|
|
|
+ printk(KERN_ERR
|
|
|
+ "hfs: invalid btree extent records (0 size).\n");
|
|
|
+ goto free_inode;
|
|
|
+ }
|
|
|
+
|
|
|
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));
|
|
@@ -89,8 +95,9 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
|
|
|
fail_page:
|
|
|
tree->inode->i_mapping->a_ops = &hfsplus_aops;
|
|
|
page_cache_release(page);
|
|
|
- free_tree:
|
|
|
+ free_inode:
|
|
|
iput(tree->inode);
|
|
|
+ free_tree:
|
|
|
kfree(tree);
|
|
|
return NULL;
|
|
|
}
|