Commit a34b58b5 authored by Pavel Machek's avatar Pavel Machek Committed by Greg Kroah-Hartman

btrfs: fix return value mixup in btrfs_get_extent

commit 881a3a11 upstream.

btrfs_get_extent() sets variable ret, but out: error path expect error
to be in variable err so the error code is lost.

Fixes: 6bf9e4bd ("btrfs: inode: Verify inode mode to avoid NULL pointer dereference")
CC: stable@vger.kernel.org # 5.4+
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarPavel Machek (CIP) <pavel@denx.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 183af2d2
...@@ -7014,7 +7014,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, ...@@ -7014,7 +7014,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,
found_type == BTRFS_FILE_EXTENT_PREALLOC) { found_type == BTRFS_FILE_EXTENT_PREALLOC) {
/* Only regular file could have regular/prealloc extent */ /* Only regular file could have regular/prealloc extent */
if (!S_ISREG(inode->vfs_inode.i_mode)) { if (!S_ISREG(inode->vfs_inode.i_mode)) {
ret = -EUCLEAN; err = -EUCLEAN;
btrfs_crit(fs_info, btrfs_crit(fs_info,
"regular/prealloc extent found for non-regular inode %llu", "regular/prealloc extent found for non-regular inode %llu",
btrfs_ino(inode)); btrfs_ino(inode));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment