diff options
| author |   Pavel Machek <pavel@denx.de> | 2020-08-03 11:35:06 +0200 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2020-08-11 12:30:17 +0200 |
| commit | 881a3a11c2b858fe9b69ef79ac5ee9978a266dc9 (patch) | |
| tree | 158cc0b67486ab5fea78b7083621d95096c641dd /fs | |
| parent | btrfs: sysfs: fix NULL pointer dereference at btrfs_sysfs_del_qgroups() (diff) | |
| download | wireguard-linux-881a3a11c2b858fe9b69ef79ac5ee9978a266dc9.tar.xz wireguard-linux-881a3a11c2b858fe9b69ef79ac5ee9978a266dc9.zip | |
btrfs: fix return value mixup in btrfs_get_extent
btrfs_get_extent() sets variable ret, but out: error path expect error
to be in variable err so the error code is lost.
Fixes: 6bf9e4bd6a27 ("btrfs: inode: Verify inode mode to avoid NULL pointer dereference")
CC: stable@vger.kernel.org # 5.4+
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Pavel Machek (CIP) <pavel@denx.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 9988d754e465..16ce82039dcf 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6627,7 +6627,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, extent_type == BTRFS_FILE_EXTENT_PREALLOC) { /* Only regular file could have regular/prealloc extent */ if (!S_ISREG(inode->vfs_inode.i_mode)) { - ret = -EUCLEAN; + err = -EUCLEAN; btrfs_crit(fs_info, "regular/prealloc extent found for non-regular inode %llu", btrfs_ino(inode)); |