bcache: Fix __bch_btree_node_alloc to make the failure behavior consistent
authorZheng Wang <zyytlz.wz@163.com>
Thu, 15 Jun 2023 12:12:22 +0000 (20:12 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 15 Jun 2023 13:32:00 +0000 (07:32 -0600)
In some specific situations, the return value of __bch_btree_node_alloc
may be NULL. This may lead to a potential NULL pointer dereference in
caller function like a calling chain :
btree_split->bch_btree_node_alloc->__bch_btree_node_alloc.

Fix it by initializing the return value in __bch_btree_node_alloc.

Fixes: cafe56359144 ("bcache: A block layer cache")
Cc: stable@vger.kernel.org
Signed-off-by: Zheng Wang <zyytlz.wz@163.com>
Signed-off-by: Coly Li <colyli@suse.de>
Link: https://lore.kernel.org/r/20230615121223.22502-6-colyli@suse.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/md/bcache/btree.c

index 7c21e54..0ddf912 100644 (file)
@@ -1090,10 +1090,12 @@ struct btree *__bch_btree_node_alloc(struct cache_set *c, struct btree_op *op,
                                     struct btree *parent)
 {
        BKEY_PADDED(key) k;
-       struct btree *b = ERR_PTR(-EAGAIN);
+       struct btree *b;
 
        mutex_lock(&c->bucket_lock);
 retry:
+       /* return ERR_PTR(-EAGAIN) when it fails */
+       b = ERR_PTR(-EAGAIN);
        if (__bch_bucket_alloc_set(c, RESERVE_BTREE, &k.key, wait))
                goto err;