]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: fix iteration of extrefs during log replay
authorFilipe Manana <fdmanana@suse.com>
Mon, 23 Jun 2025 11:11:58 +0000 (12:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Jul 2025 13:59:47 +0000 (15:59 +0200)
[ Upstream commit 54a7081ed168b72a8a2d6ef4ba3a1259705a2926 ]

At __inode_add_ref() when processing extrefs, if we jump into the next
label we have an undefined value of victim_name.len, since we haven't
initialized it before we did the goto. This results in an invalid memory
access in the next iteration of the loop since victim_name.len was not
initialized to the length of the name of the current extref.

Fix this by initializing victim_name.len with the current extref's name
length.

Fixes: e43eec81c516 ("btrfs: use struct qstr instead of name and namelen pairs")
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/btrfs/tree-log.c

index 35bb364089f8a7756048b1373c7079d1a639507b..982dc92bdf1df3d9d78b87e37789230699e44999 100644 (file)
@@ -1160,13 +1160,13 @@ again:
                        struct fscrypt_str victim_name;
 
                        extref = (struct btrfs_inode_extref *)(base + cur_offset);
+                       victim_name.len = btrfs_inode_extref_name_len(leaf, extref);
 
                        if (btrfs_inode_extref_parent(leaf, extref) != parent_objectid)
                                goto next;
 
                        ret = read_alloc_one_name(leaf, &extref->name,
-                                btrfs_inode_extref_name_len(leaf, extref),
-                                &victim_name);
+                                                 victim_name.len, &victim_name);
                        if (ret)
                                return ret;