From 4612b8954b382f046fa7f7c5696bb5c1addc245d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 2 Nov 2025 21:37:36 +0900 Subject: [PATCH] 6.17-stable patches added patches: btrfs-tree-checker-fix-bounds-check-in-check_inode_extref.patch --- ...x-bounds-check-in-check_inode_extref.patch | 33 +++++++++++++++++++ queue-6.17/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 queue-6.17/btrfs-tree-checker-fix-bounds-check-in-check_inode_extref.patch diff --git a/queue-6.17/btrfs-tree-checker-fix-bounds-check-in-check_inode_extref.patch b/queue-6.17/btrfs-tree-checker-fix-bounds-check-in-check_inode_extref.patch new file mode 100644 index 0000000000..e2d4839865 --- /dev/null +++ b/queue-6.17/btrfs-tree-checker-fix-bounds-check-in-check_inode_extref.patch @@ -0,0 +1,33 @@ +From e92c2941204de7b62e9c2deecfeb9eaefe54a22a Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Wed, 8 Oct 2025 18:08:58 +0300 +Subject: btrfs: tree-checker: fix bounds check in check_inode_extref() + +From: Dan Carpenter + +commit e92c2941204de7b62e9c2deecfeb9eaefe54a22a upstream. + +The parentheses for the unlikely() annotation were put in the wrong +place so it means that the condition is basically never true and the +bounds checking is skipped. + +Fixes: aab9458b9f00 ("btrfs: tree-checker: add inode extref checks") +Signed-off-by: Dan Carpenter +Reviewed-by: Qu Wenruo +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/tree-checker.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/btrfs/tree-checker.c ++++ b/fs/btrfs/tree-checker.c +@@ -1797,7 +1797,7 @@ static int check_inode_extref(struct ext + struct btrfs_inode_extref *extref = (struct btrfs_inode_extref *)ptr; + u16 namelen; + +- if (unlikely(ptr + sizeof(*extref)) > end) { ++ if (unlikely(ptr + sizeof(*extref) > end)) { + inode_ref_err(leaf, slot, + "inode extref overflow, ptr %lu end %lu inode_extref size %zu", + ptr, end, sizeof(*extref)); diff --git a/queue-6.17/series b/queue-6.17/series index 53e89009d8..552a158f50 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -32,3 +32,4 @@ btrfs-tree-checker-add-inode-extref-checks.patch btrfs-use-smp_mb__after_atomic-when-forcing-cow-in-c.patch sched_ext-make-qmap-dump-operation-non-destructive.patch arch-add-the-macro-compile_offsets-to-all-the-asm-of.patch +btrfs-tree-checker-fix-bounds-check-in-check_inode_extref.patch -- 2.47.3