Patch "btrfs: fix uninitialized return value in the ref-verify tool" has been added to the 6.9-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    btrfs: fix uninitialized return value in the ref-verify tool

to the 6.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     btrfs-fix-uninitialized-return-value-in-the-ref-veri.patch
and it can be found in the queue-6.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 7e0baaab5dd955a8cc396cca0fa839eb32810869
Author: Filipe Manana <fdmanana@xxxxxxxx>
Date:   Sun Jun 23 12:50:26 2024 +0100

    btrfs: fix uninitialized return value in the ref-verify tool
    
    [ Upstream commit 9da45c88e124f13a3c4d480b89b298e007fbb9e4 ]
    
    In the ref-verify tool, when processing the inline references of an extent
    item, we may end up returning with uninitialized return value, because:
    
    1) The 'ret' variable is not initialized if there are no inline extent
       references ('ptr' == 'end' before the while loop starts);
    
    2) If we find an extent owner inline reference we don't initialize 'ret'.
    
    So fix these cases by initializing 'ret' to 0 when declaring the variable
    and set it to -EINVAL if we find an extent owner inline references and
    simple quotas are not enabled (as well as print an error message).
    
    Reported-by: Mirsad Todorovac <mtodorovac69@xxxxxxxxx>
    Link: https://lore.kernel.org/linux-btrfs/59b40ebe-c824-457d-8b24-0bbca69d472b@xxxxxxxxx/
    Signed-off-by: Filipe Manana <fdmanana@xxxxxxxx>
    Reviewed-by: David Sterba <dsterba@xxxxxxxx>
    Signed-off-by: David Sterba <dsterba@xxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c
index 8c4fc98ca9ce7..aa7ddc09c55fa 100644
--- a/fs/btrfs/ref-verify.c
+++ b/fs/btrfs/ref-verify.c
@@ -441,7 +441,8 @@ static int process_extent_item(struct btrfs_fs_info *fs_info,
 	u32 item_size = btrfs_item_size(leaf, slot);
 	unsigned long end, ptr;
 	u64 offset, flags, count;
-	int type, ret;
+	int type;
+	int ret = 0;
 
 	ei = btrfs_item_ptr(leaf, slot, struct btrfs_extent_item);
 	flags = btrfs_extent_flags(leaf, ei);
@@ -486,7 +487,11 @@ static int process_extent_item(struct btrfs_fs_info *fs_info,
 						  key->objectid, key->offset);
 			break;
 		case BTRFS_EXTENT_OWNER_REF_KEY:
-			WARN_ON(!btrfs_fs_incompat(fs_info, SIMPLE_QUOTA));
+			if (!btrfs_fs_incompat(fs_info, SIMPLE_QUOTA)) {
+				btrfs_err(fs_info,
+			  "found extent owner ref without simple quotas enabled");
+				ret = -EINVAL;
+			}
 			break;
 		default:
 			btrfs_err(fs_info, "invalid key type in iref");