diff options
author | Qu Wenruo <wqu@suse.com> | 2018-06-06 15:27:13 +0800 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-08-06 15:00:34 +0200 |
commit | 3c042605db2238c09f56c197a58624d4e10c5d2e (patch) | |
tree | 16d840e1e8f861cb26e369a0e76b78e2ba599a53 /cmds-restore.c | |
parent | 90b677a2d7e6b14e3047b5ac8625269378c1198f (diff) |
btrfs-progs: Get rid of the confusing btrfs_file_extent_inline_len()
[BUG]
If one uncompressed inline extent has incorrect ram_bytes, neither btrfs
check nor dump-tree could detect such corruption.
[CAUSE]
Every caller tries to read inline extent ram_bytes is using
btrfs_file_extent_inline_len(), other than directly calling
btrfs_file_extent_ram_bytes().
For compressed extent, it's just calling btrfs_file_extent_ram_bytes().
However for uncompressed extent, it falls back to
btrfs_file_extent_inline_item_len(), makes us unable to detect anything
wrong in ram_bytes.
[FIX]
Just get rid of such confusing btrfs_file_extent_inline_len() function.
Reported-by: Steve Leung <sjleung@shaw.ca>
Tested-by: Steve Leung <sjleung@shaw.ca>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'cmds-restore.c')
-rw-r--r-- | cmds-restore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds-restore.c b/cmds-restore.c index ed932ca2..d12c1a92 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -302,7 +302,7 @@ static int copy_one_inline(struct btrfs_root *root, int fd, fi = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_file_extent_item); ptr = btrfs_file_extent_inline_start(fi); - len = btrfs_file_extent_inline_len(leaf, path->slots[0], fi); + len = btrfs_file_extent_ram_bytes(leaf, fi); inline_item_len = btrfs_file_extent_inline_item_len(leaf, btrfs_item_nr(path->slots[0])); read_extent_buffer(leaf, buf, ptr, inline_item_len); |