Commit b560729f authored by Li Lingfeng's avatar Li Lingfeng Committed by Yongqiang Liu
Browse files

scsi: don't fail if hostt->module is NULL 

hulk inclusion
category: bugfix
bugzilla: 189103, https://gitee.com/openeuler/kernel/issues/I7YWV4


CVE: NA

--------------------------------

If CONFIG_SCSI_VIRTIO is set as "y", sdev->host->hostt->module will be
NULL, which means scsi device can't be probed normally.
This problem was introduced  by
"scsi: scsi_device_gets returns failure when the module is NULL".

Fix the problem by adding a member in struct Scsi_Host to record whether
the module is builtin.

Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
conflict:
  drivers/scsi/hosts.c
Signed-off-by: default avatarZhong Jinghua <zhongjinghua@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarYongqiang Liu <liuyongqiang13@huawei.com>
parent eebf2b98

drivers/scsi/hosts.c

+3 −0
Original line number Diff line number Diff line
@@ -477,6 +477,9 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) 


	shost->use_blk_mq = scsi_use_blk_mq || shost->hostt->force_blk_mq;



	if (!sht->module)

		shost->is_builtin = true;



	device_initialize(&shost->shost_gendev);

	dev_set_name(&shost->shost_gendev, "host%d", shost->host_no);

	shost->shost_gendev.bus = &scsi_bus_type;

drivers/scsi/scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ int scsi_device_get(struct scsi_device *sdev) 
		goto fail;



	module = sdev->host->hostt->module;

	if (!module || !try_module_get(module))

	if ((!module && !sdev->host->is_builtin) || !try_module_get(module))

		goto fail_put_device;

	return 0;

include/scsi/scsi_host.h

+2 −0
Original line number Diff line number Diff line
@@ -710,6 +710,8 @@ struct Scsi_Host { 
	 */

	struct device *dma_dev;



	bool is_builtin;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)