From d6efd42a8450c67d283dbaacd127dcccca858f51 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 25 May 2025 17:04:11 -0400 Subject: [PATCH] bcachefs: Fix infinite loop in journal_entry_btree_keys_to_text() Fix an infinite loop when bkey_i->k.u64s is 0. This only happens in userspace, where 'bcachefs list_journal' can print the entire contents of the journal, and non-dirty entries aren't validated. Signed-off-by: Kent Overstreet --- fs/bcachefs/journal_io.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c index a322c3d7123ad..30122abf3e2c7 100644 --- a/fs/bcachefs/journal_io.c +++ b/fs/bcachefs/journal_io.c @@ -429,6 +429,10 @@ static void journal_entry_btree_keys_to_text(struct printbuf *out, struct bch_fs bool first = true; jset_entry_for_each_key(entry, k) { + /* We may be called on entries that haven't been validated: */ + if (!k->k.u64s) + break; + if (!first) { prt_newline(out); bch2_prt_jset_entry_type(out, entry->type); -- 2.39.5