iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Btrfs: add NULL check for do_walk_down()

Browse Source 
btrfs_find_create_tree_block() may return NULL, so we must check the returned
value, or we will access a NULL pointer.

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Miao Xie 2010-03-25 12:37:12 +00:00 committed by Chris Mason
parent 2f3014fc2a
commit 90d2c51dbb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/btrfs/extent-tree.c
View File

@ -5205,6 +5205,8 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
next = btrfs_find_tree_block(root, bytenr, blocksize); next = btrfs_find_tree_block(root, bytenr, blocksize);
if (!next) { if (!next) {
next = btrfs_find_create_tree_block(root, bytenr, blocksize); next = btrfs_find_create_tree_block(root, bytenr, blocksize);
if (!next)
return -ENOMEM;
reada = 1; reada = 1;
} }
btrfs_tree_lock(next); btrfs_tree_lock(next);
@ -5417,7 +5419,8 @@ static noinline int walk_down_tree(struct btrfs_trans_handle *trans,
if (ret > 0) { if (ret > 0) {
path->slots[level]++; path->slots[level]++;
continue; continue;
} } else if (ret < 0)
return ret;
level = wc->level; level = wc->level;
} }
return 0; return 0;