RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: check path alloc in corrupt block 

btrfs-corrupt-block added some untested path allocations.  These showed
up in static analysis when they pass their path to btrfs_search_slot()
which unconditionally dereferences the path.

Signed-off-by: Zach Brown <zab@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Zach Brown 2013-10-07 14:42:54 -07:00 committed by Chris Mason
parent 48d0762f35
commit 91f5f22d7d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
btrfs-corrupt-block.c
View File

@ -601,6 +601,9 @@ int corrupt_chunk_tree(struct btrfs_trans_handle *trans,
struct extent_buffer *leaf; struct extent_buffer *leaf;
path = btrfs_alloc_path(); path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
key.objectid = (u64)-1; key.objectid = (u64)-1;
key.offset = (u64)-1; key.offset = (u64)-1;
key.type = (u8)-1; key.type = (u8)-1;
@ -630,7 +633,7 @@ int corrupt_chunk_tree(struct btrfs_trans_handle *trans,
if (ret) if (ret)
goto free_out; goto free_out;
} }
btrfs_free_path(path); btrfs_release_path(path);
/* Here, cow and ins_len must equals 0 for the following reasons: /* Here, cow and ins_len must equals 0 for the following reasons:
* 1) chunk recover is based on disk scanning, so COW should be * 1) chunk recover is based on disk scanning, so COW should be
@ -639,7 +642,6 @@ int corrupt_chunk_tree(struct btrfs_trans_handle *trans,
* 2) if cow = 0, ins_len must also be set to 0, or BUG_ON will be * 2) if cow = 0, ins_len must also be set to 0, or BUG_ON will be
* triggered. * triggered.
*/ */
path = btrfs_alloc_path();
ret = btrfs_search_slot(trans, root, &key, path, 0, 0); ret = btrfs_search_slot(trans, root, &key, path, 0, 0);
BUG_ON(ret == 0); BUG_ON(ret == 0);
if (ret < 0) { if (ret < 0) {
@ -829,6 +831,10 @@ int main(int ac, char **av)
print_usage(); print_usage();
del = rand() % 3; del = rand() % 3;
path = btrfs_alloc_path(); path = btrfs_alloc_path();
if (!path) {
fprintf(stderr, "path allocation failed\n");
goto out_close;
}
if (find_chunk_offset(root->fs_info->chunk_root, path, if (find_chunk_offset(root->fs_info->chunk_root, path,
logical) != 0) { logical) != 0) {