diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2016-07-05 21:10:14 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-07-26 13:52:25 +0200 |
| commit | fb770ae414d018255afa7a70b14ba1f8620762dd (patch) | |
| tree | ce23654b16f7de208bb88096b2c0f9208c4a5eca /fs/btrfs/tree-log.c | |
| parent | Btrfs: fix double free of fs root (diff) | |
| download | linux-fb770ae414d018255afa7a70b14ba1f8620762dd.tar.xz linux-fb770ae414d018255afa7a70b14ba1f8620762dd.zip | |
Btrfs: fix read_node_slot to return errors
We use read_node_slot() to read btree node and it has two cases,
a) slot is out of range, which means 'no such entry'
b) we fail to read the block, due to checksum fails or corrupted
content or not with uptodate flag.
But we're returning NULL in both cases, this makes it return -ENOENT
in case a) and return -EIO in case b), and this fixes its callers
as well as btrfs_search_forward() 's caller to catch the new errors.
The problem is reported by Peter Becker, and I can manage to
hit the same BUG_ON by mounting my fuzz image.
Reported-by: Peter Becker <floyd.net@gmail.com>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index c05f69a8ec42..aa4475e3046b 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -4703,6 +4703,10 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, ins_nr = 0; ret = btrfs_search_forward(root, &min_key, path, trans->transid); + if (ret < 0) { + err = ret; + goto out_unlock; + } if (ret != 0) break; again: |