Btrfs: fix use-after-free in btrfs_replay_log

@log_root_tree should not be referenced after kfree.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Liu Bo 2015-06-11 14:16:44 +08:00 committed by Chris Mason
parent 9a4e7276d3
commit 0eeff2362b
1 changed files with 2 additions and 1 deletions

View File

@ -2321,8 +2321,9 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,
fs_info->generation + 1); fs_info->generation + 1);
if (IS_ERR(log_tree_root->node)) { if (IS_ERR(log_tree_root->node)) {
printk(KERN_ERR "BTRFS: failed to read log tree\n"); printk(KERN_ERR "BTRFS: failed to read log tree\n");
ret = PTR_ERR(log_tree_root->node);
kfree(log_tree_root); kfree(log_tree_root);
return PTR_ERR(log_tree_root->node); return ret;
} else if (!extent_buffer_uptodate(log_tree_root->node)) { } else if (!extent_buffer_uptodate(log_tree_root->node)) {
printk(KERN_ERR "BTRFS: failed to read log tree\n"); printk(KERN_ERR "BTRFS: failed to read log tree\n");
free_extent_buffer(log_tree_root->node); free_extent_buffer(log_tree_root->node);