]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: tree-checker: fix the incorrect inode ref size check
authorQu Wenruo <wqu@suse.com>
Mon, 15 Sep 2025 22:24:06 +0000 (07:54 +0930)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Sep 2025 09:13:46 +0000 (11:13 +0200)
commit 96fa515e70f3e4b98685ef8cac9d737fc62f10e1 upstream.

[BUG]
Inside check_inode_ref(), we need to make sure every structure,
including the btrfs_inode_extref header, is covered by the item.  But
our code is incorrectly using "sizeof(iref)", where @iref is just a
pointer.

This means "sizeof(iref)" will always be "sizeof(void *)", which is much
smaller than "sizeof(struct btrfs_inode_extref)".

This will allow some bad inode extrefs to sneak in, defeating tree-checker.

[FIX]
Fix the typo by calling "sizeof(*iref)", which is the same as
"sizeof(struct btrfs_inode_extref)", and will be the correct behavior we
want.

Fixes: 71bf92a9b877 ("btrfs: tree-checker: Add check for INODE_REF")
CC: stable@vger.kernel.org # 6.1+
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/btrfs/tree-checker.c

index ffa5b83d3a4a3a42251a9a5e2c9e4dae35880976..14f96d217e6e1aeaf3eb70e016355af0b5d95cf4 100644 (file)
@@ -1744,10 +1744,10 @@ static int check_inode_ref(struct extent_buffer *leaf,
        while (ptr < end) {
                u16 namelen;
 
-               if (unlikely(ptr + sizeof(iref) > end)) {
+               if (unlikely(ptr + sizeof(*iref) > end)) {
                        inode_ref_err(leaf, slot,
                        "inode ref overflow, ptr %lu end %lu inode_ref_size %zu",
-                               ptr, end, sizeof(iref));
+                               ptr, end, sizeof(*iref));
                        return -EUCLEAN;
                }