block: Fix oops scsi_disk_get()

[mirror_ubuntu-bionic-kernel.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index a9c516a8b37dbceca9f46a74b7ccb7b4df35639c..510aac1486cba038c7cf6653fbe9577899b3813a 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1352,7 +1352,7 @@ struct kobject *get_disk(struct gendisk *disk)
        owner = disk->fops->owner;
        if (owner && !try_module_get(owner))
                return NULL;
-       kobj = kobject_get(&disk_to_dev(disk)->kobj);
+       kobj = kobject_get_unless_zero(&disk_to_dev(disk)->kobj);
        if (kobj == NULL) {
                module_put(owner);
                return NULL;