diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2016-06-17 19:16:21 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-06-23 10:44:40 -0700 |
| commit | 415b35a55b57a701afe7391d32a6bb0193b7d3da (patch) | |
| tree | 2e54dbe6ce61612eb8661107fded18fd656c1289 /fs/btrfs/ctree.c | |
| parent | 04e1b65af2085d4102b2b5d2fd1e050f8ee63092 (diff) | |
| download | lwn-415b35a55b57a701afe7391d32a6bb0193b7d3da.tar.gz lwn-415b35a55b57a701afe7391d32a6bb0193b7d3da.zip | |
Btrfs: fix error handling in map_private_extent_buffer
map_private_extent_buffer() can return -EINVAL in two different cases,
1. when the requested contents span two pages if nodesize is larger
than pagesize,
2. when it detects something insane.
The 2nd one used to be only a WARN_ON(1), and we decided to return a error
to callers, but we didn't fix up all its callers, which will be
addressed by this patch.
Without this, btrfs may end up with 'general protection', ie.
reading invalid memory.
Reported-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/ctree.c')
| -rw-r--r-- | fs/btrfs/ctree.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 6276add8538a..a85cf7d23309 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -1786,10 +1786,12 @@ static noinline int generic_bin_search(struct extent_buffer *eb, if (!err) { tmp = (struct btrfs_disk_key *)(kaddr + offset - map_start); - } else { + } else if (err == 1) { read_extent_buffer(eb, &unaligned, offset, sizeof(unaligned)); tmp = &unaligned; + } else { + return err; } } else { @@ -2830,6 +2832,8 @@ cow_done: } ret = key_search(b, key, level, &prev_cmp, &slot); + if (ret < 0) + goto done; if (level != 0) { int dec = 0; |