diff options
| author | Liu Bo | 2016-06-18 04:16:21 +0200 |
|---|---|---|
| committer | Chris Mason | 2016-06-23 19:44:40 +0200 |
| commit | 415b35a55b57a701afe7391d32a6bb0193b7d3da (patch) | |
| tree | 2e54dbe6ce61612eb8661107fded18fd656c1289 /fs/btrfs/extent_io.c | |
| parent | Btrfs: fix error return code in btrfs_init_test_fs() (diff) | |
| download | kernel-qcow2-linux-415b35a55b57a701afe7391d32a6bb0193b7d3da.tar.gz kernel-qcow2-linux-415b35a55b57a701afe7391d32a6bb0193b7d3da.tar.xz kernel-qcow2-linux-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/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index aaee3ef55ed8..75533adef998 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -5342,6 +5342,11 @@ int read_extent_buffer_to_user(struct extent_buffer *eb, void __user *dstv, return ret; } +/* + * return 0 if the item is found within a page. + * return 1 if the item spans two pages. + * return -EINVAL otherwise. + */ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start, unsigned long min_len, char **map, unsigned long *map_start, @@ -5356,7 +5361,7 @@ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start, PAGE_SHIFT; if (i != end_i) - return -EINVAL; + return 1; if (i == 0) { offset = start_offset; |