Skip to contentSkip to conversation

bcachefs: Fix memmove when move keys down

PATCH Applied Alan Huang 2 participants 2 messages Feb 20, 2025

lore
Share & tools
lore

Alan Huang

author
#0 lore raw

PATCH 1/1 bcachefs: Fix memmove when move keys down

The fix alone doesn't fix [1], but should be applied before debugging that.

[1] https://syzkaller.appspot.com/bug?extid=38a0cbd267eff2d286ff

---
 fs/bcachefs/btree_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/btree_io.c +1 -1
index e71b278672b6..80a0094be356 100644
@@ -997,7 +997,7 @@ static int validate_bset_keys(struct bch_fs *c, struct btree *b,
 		}
 got_good_key:
 		le16_add_cpu(&i->u64s, -next_good_key);
-		memmove_u64s_down(k, bkey_p_next(k), (u64 *) vstruct_end(i) - (u64 *) k);
+		memmove_u64s_down(k, (u64 *) k + next_good_key, (u64 *) vstruct_end(i) - (u64 *) k);
 		set_btree_node_need_rewrite(b);
 	}
 fsck_err:
Signature · 1 line
2.48.1
#1 lore raw
Quoted 6 lines · Alan Huang

The fix alone doesn't fix [1], but should be applied before debugging that.

[1] https://syzkaller.appspot.com/bug?extid=38a0cbd267eff2d286ff

Applied

Quoted 20 lines
---
 fs/bcachefs/btree_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/btree_io.c +1 -1
index e71b278672b6..80a0094be356 100644
@@ -997,7 +997,7 @@ static int validate_bset_keys(struct bch_fs *c, struct btree *b,
 		}
 got_good_key:
 		le16_add_cpu(&i->u64s, -next_good_key);
-		memmove_u64s_down(k, bkey_p_next(k), (u64 *) vstruct_end(i) - (u64 *) k);
+		memmove_u64s_down(k, (u64 *) k + next_good_key, (u64 *) vstruct_end(i) - (u64 *) k);
 		set_btree_node_need_rewrite(b);
 	}
 fsck_err:
Signature · 1 line
2.48.1