diff options
| author | Qu Wenruo <quwenruo.btrfs@gmx.com> | 2017-08-23 10:57:57 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-10-30 14:27:58 +0300 |
| commit | 7f43d4affb2a254d421ab20b0cf65ac2569909fb (patch) | |
| tree | 385315443ada8869218f57cf52330f270aad9f10 | |
| parent | c3267bbaa9cae09b62960eafe33ad19196803285 (diff) | |
| download | linux-7f43d4affb2a254d421ab20b0cf65ac2569909fb.tar.xz | |
btrfs: Check if item pointer overlaps with the item itself
Function check_leaf() checks if any item pointer points outside of the
leaf, but it doesn't check if the pointer overlaps with the item itself.
Normally only the last item may be the victim, but adding such check is
never a bad idea anyway.
Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/disk-io.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 6c97ae1e7288..d1770b3e0385 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -643,6 +643,13 @@ static noinline int check_leaf(struct btrfs_root *root, return -EUCLEAN; } + /* Also check if the item pointer overlaps with btrfs item. */ + if (btrfs_item_nr_offset(slot) + sizeof(struct btrfs_item) > + btrfs_item_ptr_offset(leaf, slot)) { + CORRUPT("slot overlap with its data", leaf, root, slot); + return -EUCLEAN; + } + prev_key.objectid = key.objectid; prev_key.type = key.type; prev_key.offset = key.offset; |