summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-05-23 18:42:51 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2021-05-25 18:09:33 -0400
commit30694330463fdaa6dbbb7d089b8cc0fdf2547c90 (patch)
tree70c1dc9ae7172a9c54bc3ad54771fc93415ebd11
parent9e4f1773d7e9331bde9d96770080db08f4609d6c (diff)
bcachefs: Fix a null ptr deref
bch2_btree_iter_peek() won't always return a key - whoops. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r--fs/bcachefs/move.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index 778ff72cf5b2..2d5c4e9bbf42 100644
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -523,6 +523,11 @@ static int lookup_inode(struct btree_trans *trans, struct bpos pos,
if (ret)
goto err;
+ if (!k.k || bkey_cmp(k.k->p, pos)) {
+ ret = -ENOENT;
+ goto err;
+ }
+
ret = k.k->type == KEY_TYPE_inode ? 0 : -EIO;
if (ret)
goto err;