Skip to content

Commit 03cc1e6

Browse files
author
Kent Overstreet
committed
bcachefs: Fix null ptr deref in bch2_backpointer_get_node()
bch2_btree_iter_peek_node() can return a NULL ptr (when the tree is shorter than the search depth); handle this with an early return. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev> Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Fixes: https://lore.kernel.org/linux-bcachefs/5fc3c28b-c232-4ec7-b0ac-4ef220ddf976@moroto.mountain/T/ Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
1 parent 274c2f8 commit 03cc1e6

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

fs/bcachefs/backpointers.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,17 @@ struct btree *bch2_backpointer_get_node(struct btree_trans *trans,
313313
bp.level - 1,
314314
0);
315315
b = bch2_btree_iter_peek_node(iter);
316-
if (IS_ERR(b))
316+
if (IS_ERR_OR_NULL(b))
317317
goto err;
318318

319319
BUG_ON(b->c.level != bp.level - 1);
320320

321-
if (b && extent_matches_bp(c, bp.btree_id, bp.level,
322-
bkey_i_to_s_c(&b->key),
323-
bucket, bp))
321+
if (extent_matches_bp(c, bp.btree_id, bp.level,
322+
bkey_i_to_s_c(&b->key),
323+
bucket, bp))
324324
return b;
325325

326-
if (b && btree_node_will_make_reachable(b)) {
326+
if (btree_node_will_make_reachable(b)) {
327327
b = ERR_PTR(-BCH_ERR_backpointer_to_overwritten_btree_node);
328328
} else {
329329
backpointer_not_found(trans, bp_pos, bp, bkey_i_to_s_c(&b->key));

0 commit comments

Comments
 (0)