summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEryu Guan <guaneryu@gmail.com>2015-10-19 19:37:50 +0800
committerDavid Sterba <dsterba@suse.com>2015-11-02 09:35:02 +0100
commit380b1c8ced887bbaa655f863390b5a855e98fb7f (patch)
tree9001f790afc8f2702d3b7034e2b11362014e8729
parent14ac9851462c29f3f97355df5b4c3c9f1953c043 (diff)
btrfs-progs: fix leak of "path" in btrfs_find_item() error paths
path needs to be freed before return. Signed-off-by: Eryu Guan <guaneryu@gmail.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--ctree.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/ctree.c b/ctree.c
index e6e5689a..14340076 100644
--- a/ctree.c
+++ b/ctree.c
@@ -1058,26 +1058,28 @@ int btrfs_find_item(struct btrfs_root *fs_root, struct btrfs_path *found_path,
path = found_path;
ret = btrfs_search_slot(NULL, fs_root, &key, path, 0, 0);
- if ((ret < 0) || (found_key == NULL)) {
- if (path != found_path)
- btrfs_free_path(path);
- return ret;
- }
+ if ((ret < 0) || (found_key == NULL))
+ goto out;
eb = path->nodes[0];
if (ret && path->slots[0] >= btrfs_header_nritems(eb)) {
ret = btrfs_next_leaf(fs_root, path);
if (ret)
- return ret;
+ goto out;
eb = path->nodes[0];
}
btrfs_item_key_to_cpu(eb, found_key, path->slots[0]);
if (found_key->type != key.type ||
- found_key->objectid != key.objectid)
- return 1;
+ found_key->objectid != key.objectid) {
+ ret = 1;
+ goto out;
+ }
- return 0;
+out:
+ if (path != found_path)
+ btrfs_free_path(path);
+ return ret;
}
/*