Commit 7205981e authored by Tyrel Datwyler's avatar Tyrel Datwyler Committed by Martin K. Petersen
Browse files

scsi: ibmvscsi: Protect ibmvscsi_head from concurrent modificaiton 



For each ibmvscsi host created during a probe or destroyed during a remove
we either add or remove that host to/from the global ibmvscsi_head
list. This runs the risk of concurrent modification.

This patch adds a simple spinlock around the list modification calls to
prevent concurrent updates as is done similarly in the ibmvfc driver and
ipr driver.

Fixes: 32d6e4b6 ("scsi: ibmvscsi: add vscsi hosts to global list_head")
Cc: <stable@vger.kernel.org> # v4.10+
Signed-off-by: default avatarTyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0e83fc61

drivers/scsi/ibmvscsi/ibmvscsi.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -96,6 +96,7 @@ static int client_reserve = 1; 
static char partition_name[96] = "UNKNOWN";

static char partition_name[96] = "UNKNOWN";

static unsigned int partition_number = -1;

static unsigned int partition_number = -1;

static LIST_HEAD(ibmvscsi_head);

static LIST_HEAD(ibmvscsi_head);

static DEFINE_SPINLOCK(ibmvscsi_driver_lock);





static struct scsi_transport_template *ibmvscsi_transport_template;

static struct scsi_transport_template *ibmvscsi_transport_template;
@@ -2270,7 +2271,9 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id) 
	}

	}





	dev_set_drvdata(&vdev->dev, hostdata);

	dev_set_drvdata(&vdev->dev, hostdata);

	spin_lock(&ibmvscsi_driver_lock);

	list_add_tail(&hostdata->host_list, &ibmvscsi_head);

	list_add_tail(&hostdata->host_list, &ibmvscsi_head);

	spin_unlock(&ibmvscsi_driver_lock);

	return 0;

	return 0;





      add_srp_port_failed:

      add_srp_port_failed:
@@ -2292,7 +2295,9 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id) 
static int ibmvscsi_remove(struct vio_dev *vdev)

static int ibmvscsi_remove(struct vio_dev *vdev)

{

{

	struct ibmvscsi_host_data *hostdata = dev_get_drvdata(&vdev->dev);

	struct ibmvscsi_host_data *hostdata = dev_get_drvdata(&vdev->dev);

	spin_lock(&ibmvscsi_driver_lock);

	list_del(&hostdata->host_list);

	list_del(&hostdata->host_list);

	spin_unlock(&ibmvscsi_driver_lock);

	unmap_persist_bufs(hostdata);

	unmap_persist_bufs(hostdata);

	release_event_pool(&hostdata->pool, hostdata);

	release_event_pool(&hostdata->pool, hostdata);

	ibmvscsi_release_crq_queue(&hostdata->queue, hostdata,

	ibmvscsi_release_crq_queue(&hostdata->queue, hostdata,

CRA Git | Maintained and supported by SUSTech CRA and CCSE