Skip to contentSkip to conversation

bcachefs: Fix b->written overflow

PATCH Applied Alan Huang 2 participants 2 messages Mar 7, 2025

lore
Share & tools
lore

Alan Huang

author
#0 lore raw

PATCH 1/1 bcachefs: Fix b->written overflow

When bset past end of btree node, we should not add sectors to b->written, which will overflow b->written.

---
 fs/bcachefs/btree_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/btree_io.c +1 -1
index 80a0094be356..18413b4f22a3 100644
@@ -1187,7 +1187,7 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca,
 			     le64_to_cpu(i->journal_seq),
 			     b->written, b->written + sectors, ptr_written);
 
-		b->written += sectors;
+		b->written = min(b->written + sectors, btree_sectors(c));
 
 		if (blacklisted && !first)
 			continue;
Signature · 1 line
2.48.1
#1 lore raw
Quoted 6 lines · Alan Huang

When bset past end of btree node, we should not add sectors to b->written, which will overflow b->written.

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 80a0094be356..18413b4f22a3 100644
@@ -1187,7 +1187,7 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca,
 			     le64_to_cpu(i->journal_seq),
 			     b->written, b->written + sectors, ptr_written);
 
-		b->written += sectors;
+		b->written = min(b->written + sectors, btree_sectors(c));
 
 		if (blacklisted && !first)
 			continue;
Signature · 1 line
2.48.1