Skip to content

Commit 8f8a08c

Browse files
adam900710gregkh
authored andcommitted
btrfs: tree-checker: fix the incorrect inode ref size check
commit 96fa515 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: 71bf92a ("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>
1 parent ba0e586 commit 8f8a08c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/btrfs/tree-checker.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,10 +1612,10 @@ static int check_inode_ref(struct extent_buffer *leaf,
16121612
while (ptr < end) {
16131613
u16 namelen;
16141614

1615-
if (unlikely(ptr + sizeof(iref) > end)) {
1615+
if (unlikely(ptr + sizeof(*iref) > end)) {
16161616
inode_ref_err(leaf, slot,
16171617
"inode ref overflow, ptr %lu end %lu inode_ref_size %zu",
1618-
ptr, end, sizeof(iref));
1618+
ptr, end, sizeof(*iref));
16191619
return -EUCLEAN;
16201620
}
16211621

0 commit comments

Comments
 (0)