diff options
| author | Filipe Manana <fdmanana@suse.com> | 2022-02-17 12:12:07 +0000 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-03-14 13:13:52 +0100 |
| commit | 1f4613cdbe7739ce291554b316bff8e551383389 (patch) | |
| tree | 55bdfe9088c048df0c9e7a4f1759b139bf561ab9 /fs/btrfs | |
| parent | 23e3337faf73e5bb2610697977e175313d48acb0 (diff) | |
| download | lwn-1f4613cdbe7739ce291554b316bff8e551383389.tar.gz lwn-1f4613cdbe7739ce291554b316bff8e551383389.zip | |
btrfs: fix unexpected error path when reflinking an inline extent
When reflinking an inline extent, we assert that its file offset is 0 and
that its uncompressed length is not greater than the sector size. We then
return an error if one of those conditions is not satisfied. However we
use a return statement, which results in returning from btrfs_clone()
without freeing the path and buffer that were allocated before, as well as
not clearing the flag BTRFS_INODE_NO_DELALLOC_FLUSH for the destination
inode.
Fix that by jumping to the 'out' label instead, and also add a WARN_ON()
for each condition so that in case assertions are disabled, we get to
known which of the unexpected conditions triggered the error.
Fixes: a61e1e0df9f321 ("Btrfs: simplify inline extent handling when doing reflinks")
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/reflink.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c index cdcfeab82e12..07e19e069c84 100644 --- a/fs/btrfs/reflink.c +++ b/fs/btrfs/reflink.c @@ -505,8 +505,11 @@ process_slot: */ ASSERT(key.offset == 0); ASSERT(datal <= fs_info->sectorsize); - if (key.offset != 0 || datal > fs_info->sectorsize) - return -EUCLEAN; + if (WARN_ON(key.offset != 0) || + WARN_ON(datal > fs_info->sectorsize)) { + ret = -EUCLEAN; + goto out; + } ret = clone_copy_inline_extent(inode, path, &new_key, drop_start, datal, size, |