From 443d2760e51f3e17ddb47ddaf969ba49e6dbd06d Mon Sep 17 00:00:00 2001
From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Sun, 23 May 2021 18:42:51 -0400
Subject: [PATCH] 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>
---
fs/bcachefs/move.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index bce10eb4eb4c6..8807b18ddc433 100644
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -522,6 +522,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;
--
2.30.2