aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu Bo <bo.liu@linux.alibaba.com>2018-04-02 13:59:47 -0400
committerDavid Sterba <dsterba@suse.com>2018-04-05 13:22:17 -0400
commit80c0b4210a963e31529e15bf90519708ec947596 (patch)
tree526c3e6f1bdc12aabf541687a992c806576aaa5b
parent57599c7e7722daf5f8c2dba4b0e4628f5c500771 (diff)
Btrfs: fix NULL pointer dereference in log_dir_items
0, 1 and <0 can be returned by btrfs_next_leaf(), and when <0 is returned, path->nodes[0] could be NULL, log_dir_items lacks such a check for <0 and we may run into a null pointer dereference panic. Fixes: e02119d5a7b4 ("Btrfs: Add a write ahead tree log to optimize synchronous operations") Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: Liu Bo <bo.liu@linux.alibaba.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/tree-log.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index c91babc6aa4b..c6bfa86e2f22 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3520,8 +3520,11 @@ static noinline int log_dir_items(struct btrfs_trans_handle *trans,
3520 * from this directory and from this transaction 3520 * from this directory and from this transaction
3521 */ 3521 */
3522 ret = btrfs_next_leaf(root, path); 3522 ret = btrfs_next_leaf(root, path);
3523 if (ret == 1) { 3523 if (ret) {
3524 last_offset = (u64)-1; 3524 if (ret == 1)
3525 last_offset = (u64)-1;
3526 else
3527 err = ret;
3525 goto done; 3528 goto done;
3526 } 3529 }
3527 btrfs_item_key_to_cpu(path->nodes[0], &tmp, path->slots[0]); 3530 btrfs_item_key_to_cpu(path->nodes[0], &tmp, path->slots[0]);