marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: prevent close_root if the root to close is potentially NULL 

Originally only if 'block_only' is specified, the 'fs_root == NULL'
will be checked. But if 'block_only' is not specified and close_root
will be called blindly without checking 'fs_root == NULL', which is
unsafe.

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
master
Gui Hecheng 2014-04-24 11:39:28 +08:00 committed by David Sterba
parent aa46922c09
commit 9317400a67
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
btrfs-debug-tree.c
View File

@ -177,13 +177,14 @@ int main(int ac, char **av)
fprintf(stderr, "unable to open %s\n", av[optind]);
exit(1);
}
root = info->fs_root;
if (!root) {
fprintf(stderr, "unable to open %s\n", av[optind]);
exit(1);
}
if (block_only) {
if (!root) {
fprintf(stderr, "unable to open %s\n", av[optind]);
exit(1);
}
leaf = read_tree_block(root,
block_only,
root->leafsize, 0);