aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchandan <chandan@linux.vnet.ibm.com>2015-10-05 12:44:25 -0400
committerChris Mason <clm@fb.com>2015-10-06 09:55:22 -0400
commite5fffbac4a49270e4976d71a0e054c0cf3ef4f8e (patch)
tree66e59e0b269ac75097275d7632ef58060e11876f
parentd9a0540a79f87456907f2ce031f058cf745c5bff (diff)
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: Chandan Rajendra <chandan@linux.vnet.ibm.com>
-rw-r--r--fs/btrfs/disk-io.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index aa59871885da..807f6854acaa 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2842,6 +2842,8 @@ int open_ctree(struct super_block *sb,
2842 !extent_buffer_uptodate(chunk_root->node)) { 2842 !extent_buffer_uptodate(chunk_root->node)) {
2843 printk(KERN_ERR "BTRFS: failed to read chunk root on %s\n", 2843 printk(KERN_ERR "BTRFS: failed to read chunk root on %s\n",
2844 sb->s_id); 2844 sb->s_id);
2845 if (!IS_ERR(chunk_root->node))
2846 free_extent_buffer(chunk_root->node);
2845 chunk_root->node = NULL; 2847 chunk_root->node = NULL;
2846 goto fail_tree_roots; 2848 goto fail_tree_roots;
2847 } 2849 }
@@ -2880,6 +2882,8 @@ retry_root_backup:
2880 !extent_buffer_uptodate(tree_root->node)) { 2882 !extent_buffer_uptodate(tree_root->node)) {
2881 printk(KERN_WARNING "BTRFS: failed to read tree root on %s\n", 2883 printk(KERN_WARNING "BTRFS: failed to read tree root on %s\n",
2882 sb->s_id); 2884 sb->s_id);
2885 if (!IS_ERR(tree_root->node))
2886 free_extent_buffer(tree_root->node);
2883 tree_root->node = NULL; 2887 tree_root->node = NULL;
2884 goto recovery_tree_root; 2888 goto recovery_tree_root;
2885 } 2889 }