summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-12-16 23:37:47 +0300
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-23 00:08:33 +0300
commitb5a5c4c1033af72b94c1ba7a71f61e4231f27832 (patch)
tree3bd093a9080cf547e90c2ebbd1c9b84eee9f963d /fs
parentae2f17d5ad02bc85a31d09c4396e177581abbb1f (diff)
downloadlinux-b5a5c4c1033af72b94c1ba7a71f61e4231f27832.tar.xz
bcachefs: Fix a null ptr deref in btree_iter_traverse_one()
When traversing nodes and we've reached the end of the btree, the current btree node will be NULL. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com> Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs')
-rw-r--r--fs/bcachefs/btree_iter.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index f05a5e718181..34443d18bc42 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -1148,7 +1148,8 @@ static int btree_iter_traverse_one(struct btree_iter *iter)
iter->uptodate = BTREE_ITER_NEED_PEEK;
bch2_btree_trans_verify_locks(iter->trans);
- __bch2_btree_iter_verify(iter, iter->l[iter->level].b);
+ if (btree_iter_node(iter, iter->level))
+ __bch2_btree_iter_verify(iter, iter->l[iter->level].b);
return 0;
}