block: fix NULL pointer dereference in register_disk
authorzhengbin <zhengbin13@huawei.com>
Wed, 20 Feb 2019 13:27:05 +0000 (21:27 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 28 Feb 2019 21:01:36 +0000 (14:01 -0700)
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>
block/genhd.c

index 1dd8fd6..78b82d2 100644 (file)
@@ -655,10 +655,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);
+       }
 }
 
 /**