diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2015-06-11 14:16:44 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-06-12 11:03:21 -0700 |
| commit | 0eeff2362b829b5e80f8b69f86b60b8094bc742d (patch) | |
| tree | c1b6a793279d145309aa681817bd8644561af660 | |
| parent | 9a4e7276d39071576d369e607d7accb84b41d0b4 (diff) | |
| download | op-kernel-dev-0eeff2362b829b5e80f8b69f86b60b8094bc742d.zip op-kernel-dev-0eeff2362b829b5e80f8b69f86b60b8094bc742d.tar.gz | |
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>
| -rw-r--r-- | fs/btrfs/disk-io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 695363a..b7fa3ba 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2321,8 +2321,9 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info, fs_info->generation + 1); if (IS_ERR(log_tree_root->node)) { printk(KERN_ERR "BTRFS: failed to read log tree\n"); + ret = PTR_ERR(log_tree_root->node); kfree(log_tree_root); - return PTR_ERR(log_tree_root->node); + return ret; } else if (!extent_buffer_uptodate(log_tree_root->node)) { printk(KERN_ERR "BTRFS: failed to read log tree\n"); free_extent_buffer(log_tree_root->node); |
