block: fix NULL pointer dereference in register_disk

commit 4d7c1d3fd7c7eda7dea351f071945e843a46c145 upstream.

If __device_add_disk-->bdi_register_owner-->bdi_register-->
bdi_register_va-->device_create_vargs fails, bdi->dev is still
NULL, __device_add_disk-->register_disk will visit bdi->dev->kobj.
This patch fixes that.

Signed-off-by: zhengbin <zhengbin13@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jack Wang <jinpu.wang@cloud.ionos.com>

diff --git a/block/genhd.c b/block/genhd.c
index 2b536ab570ac1e03a79d1201d421a1704f046c9b..6965dde963736db84d2637d44a8faec88f59556f 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -652,10 +652,12 @@ exit:
                kobject_uevent(&part_to_dev(part)->kobj, KOBJ_ADD);
        disk_part_iter_exit(&piter);
 
-       err = sysfs_create_link(&ddev->kobj,
-                               &disk->queue->backing_dev_info->dev->kobj,
-                               "bdi");
-       WARN_ON(err);
+       if (disk->queue->backing_dev_info->dev) {
+               err = sysfs_create_link(&ddev->kobj,
+                         &disk->queue->backing_dev_info->dev->kobj,
+                         "bdi");
+               WARN_ON(err);
+       }
 }
 
 /**