btrfs: fix error value in btrfs_get_extent
PATCH 1/1 btrfs: fix error value in btrfs_get_extent
btrfs_get_extent() sets variable ret, but out: error path expect error to be in variable err. Fix that.
---
Notice that patch introducing this problem is on its way to 4.19.137-stable.
fs/btrfs/inode.c +1 -1
@@ -7012,7 +7012,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, found_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));
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 4 lines · Pavel Machek
btrfs_get_extent()sets variable ret, but out: error path expect error to be in variable err. Fix that.Signed-off-by Pavel Machek (CIP) <[email protected]>
Good catch, this also needs:
pointer dereference")
Quoted 19 lines
---
Notice that patch introducing this problem is on its way to 4.19.137-stable.
fs/btrfs/inode.c +1
-1@@ -7012,7 +7012,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, found_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));
Quoted 6 lines · Nikolay Borisov
Quoted 3 lines · Pavel Machek
btrfs_get_extent()sets variable ret, but out: error path expect error to be in variable err. Fix that.
Quoted 8 lines
Quoted 1 line
Signed-off-by Pavel Machek (CIP) <[email protected]>Good catch, this also needs:
Fixes 6bf9e4bd6a27 ("btrfs: inode: Verify inode mode to avoid NULLpointer dereference")
Reviewed-by Nikolay Borisov <[email protected]>
Actually the reason this error got introduced in the first place and I missed it during the review is that the function is doing something rather counter-intuitive - it's using 'err' variable as a synonym for 'ret'. A better approach would be to simply remove 'err' from that function. I'm now authoring such a patch, nevertheless the issue still stands.
Quoted 22 lines
Quoted 21 lines
---
Notice that patch introducing this problem is on its way to 4.19.137-stable.
fs/btrfs/inode.c +1
-1@@ -7012,7 +7012,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, found_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));
Quoted 12 lines · Nikolay Borisov
Quoted 11 lines · Nikolay Borisov
Quoted 4 lines · Pavel Machek
btrfs_get_extent()sets variable ret, but out: error path expect error to be in variable err. Fix that.Signed-off-by Pavel Machek (CIP) <[email protected]>Good catch, this also needs:
Fixes 6bf9e4bd6a27 ("btrfs: inode: Verify inode mode to avoid NULLpointer dereference")
Quoted 8 lines
Quoted 1 line
Reviewed-by Nikolay Borisov <[email protected]>Actually the reason this error got introduced in the first place and I missed it during the review is that the function is doing something rather counter-intuitive - it's using 'err' variable as a synonym for 'ret'. A better approach would be to simply remove 'err' from that function. I'm now authoring such a patch, nevertheless the issue still stands.
The expected pattern is to use 'ret' for function return value and add other temporary variables instead of the err/ret switching, which can be found in the oldish code still. So the cleanup is going to do the right thing, thanks.
Quoted 4 lines · Pavel Machek
btrfs_get_extent()sets variable ret, but out: error path expect error to be in variable err. Fix that.Signed-off-by Pavel Machek (CIP) <[email protected]>
Thanks, patch queued for 5.9.
Quoted 4 lines
---
Notice that patch introducing this problem is on its way to 4.19.137-stable.
Yeah, I'll let stable team know once this patch gets merged that the relevant patches can be picked.