Commit e5fffbac authored by chandan's avatar chandan Committed by Chris Mason

Btrfs: open_ctree: Fix possible memory leak

After reading one of chunk or tree root tree's root node from disk, if the
root node does not have EXTENT_BUFFER_UPTODATE flag set, we fail to release
the memory used by the root node. Fix this.
Signed-off-by: default avatarChandan Rajendra <chandan@linux.vnet.ibm.com>
parent d9a0540a
...@@ -2842,6 +2842,8 @@ int open_ctree(struct super_block *sb, ...@@ -2842,6 +2842,8 @@ int open_ctree(struct super_block *sb,
!extent_buffer_uptodate(chunk_root->node)) { !extent_buffer_uptodate(chunk_root->node)) {
printk(KERN_ERR "BTRFS: failed to read chunk root on %s\n", printk(KERN_ERR "BTRFS: failed to read chunk root on %s\n",
sb->s_id); sb->s_id);
if (!IS_ERR(chunk_root->node))
free_extent_buffer(chunk_root->node);
chunk_root->node = NULL; chunk_root->node = NULL;
goto fail_tree_roots; goto fail_tree_roots;
} }
...@@ -2880,6 +2882,8 @@ int open_ctree(struct super_block *sb, ...@@ -2880,6 +2882,8 @@ int open_ctree(struct super_block *sb,
!extent_buffer_uptodate(tree_root->node)) { !extent_buffer_uptodate(tree_root->node)) {
printk(KERN_WARNING "BTRFS: failed to read tree root on %s\n", printk(KERN_WARNING "BTRFS: failed to read tree root on %s\n",
sb->s_id); sb->s_id);
if (!IS_ERR(tree_root->node))
free_extent_buffer(tree_root->node);
tree_root->node = NULL; tree_root->node = NULL;
goto recovery_tree_root; goto recovery_tree_root;
} }
......
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