Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dc05952 authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman
Browse files

scsi: core: Put .shost_dev in failure path if host state changes to RUNNING 

commit 11714026c02d613c30a149c3f4c4a15047744529 upstream.

scsi_host_dev_release() only frees dev_name when host state is
SHOST_CREATED. After host state has changed to SHOST_RUNNING,
scsi_host_dev_release() no longer cleans up.

Fix this by doing a put_device(&shost->shost_dev) in the failure path when
host state is SHOST_RUNNING. Move get_device(&shost->shost_gendev) before
device_add(&shost->shost_dev) so that scsi_host_cls_release() can do a put
on this reference.

Link: https://lore.kernel.org/r/20210602133029.2864069-4-ming.lei@redhat.com


Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Hannes Reinecke <hare@suse.de>
Reported-by: default avatarJohn Garry <john.garry@huawei.com>
Tested-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2dc85045

drivers/scsi/hosts.c

+6 −2
Original line number Diff line number Diff line
@@ -261,12 +261,11 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, 


	device_enable_async_suspend(&shost->shost_dev);



	get_device(&shost->shost_gendev);

	error = device_add(&shost->shost_dev);

	if (error)

		goto out_del_gendev;



	get_device(&shost->shost_gendev);



	if (shost->transportt->host_size) {

		shost->shost_data = kzalloc(shost->transportt->host_size,

					 GFP_KERNEL);
@@ -303,6 +302,11 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, 
 out_del_dev:

	device_del(&shost->shost_dev);

 out_del_gendev:

	/*

	 * Host state is SHOST_RUNNING so we have to explicitly release

	 * ->shost_dev.

	 */

	put_device(&shost->shost_dev);

	device_del(&shost->shost_gendev);

 out_disable_runtime_pm:

	device_disable_async_suspend(&shost->shost_gendev);