aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-05-23 18:42:51 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-22 17:09:04 -0400
commit443d2760e51f3e17ddb47ddaf969ba49e6dbd06d (patch)
tree40f405f5f67f259acbae9e03b5cf2ab5c1298a7a /fs
parent9dd89a05fd946869c23e12fcfb9b9643b337fd56 (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>
Diffstat (limited to 'fs')
-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 bce10eb4eb4c..8807b18ddc43 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;