diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-17 04:05:42 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-01-06 19:47:54 -0500 |
| commit | 147f74c5dd6de937f29342e37d1f50a2a08113d8 (patch) | |
| tree | 39174d92e10077517110371958fc3d9eeb372e81 | |
| parent | 5dc54f40660f944634e6050851bf5267180bf213 (diff) | |
bcachefs: Fix null ptr deref in backpointers check code
This only occured in the drop_alloc tests - when looking up a
backpointer to a node that no longer exists because the btree is shorter
than it was before.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/backpointers.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/bcachefs/backpointers.c b/fs/bcachefs/backpointers.c index a537768c4600..d74de1df7aa3 100644 --- a/fs/bcachefs/backpointers.c +++ b/fs/bcachefs/backpointers.c @@ -535,7 +535,7 @@ struct bkey_s_c bch2_backpointer_get_key(struct btree_trans *trans, if (bp.level == c->btree_roots[bp.btree_id].level + 1) k = bkey_i_to_s_c(&c->btree_roots[bp.btree_id].key); - if (extent_matches_bp(c, bp.btree_id, bp.level, k, bucket, bp)) + if (k.k && extent_matches_bp(c, bp.btree_id, bp.level, k, bucket, bp)) return k; bch2_trans_iter_exit(trans, iter); @@ -585,12 +585,12 @@ struct btree *bch2_backpointer_get_node(struct btree_trans *trans, if (IS_ERR(b)) goto err; - if (extent_matches_bp(c, bp.btree_id, bp.level, - bkey_i_to_s_c(&b->key), - bucket, bp)) + if (b && extent_matches_bp(c, bp.btree_id, bp.level, + bkey_i_to_s_c(&b->key), + bucket, bp)) return b; - if (btree_node_will_make_reachable(b)) { + if (b && btree_node_will_make_reachable(b)) { b = ERR_PTR(-BCH_ERR_backpointer_to_overwritten_btree_node); } else { backpointer_not_found(trans, bucket, bp_offset, bp, |