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

Commit e5dbfa66 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by James Bottomley
Browse files

[SCSI] ibmvscsi: fix leak when failing to send srp event 



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 2ea00202

drivers/scsi/ibmvscsi/ibmvscsi.c

+18 −12
Original line number Diff line number Diff line
@@ -739,6 +739,7 @@ static void send_mad_adapter_info(struct ibmvscsi_host_data *hostdata) 
{

	struct viosrp_adapter_info *req;

	struct srp_event_struct *evt_struct;

	dma_addr_t addr;



	evt_struct = get_event_struct(&hostdata->pool);

	if (!evt_struct) {
@@ -757,7 +758,7 @@ static void send_mad_adapter_info(struct ibmvscsi_host_data *hostdata) 
	

	req->common.type = VIOSRP_ADAPTER_INFO_TYPE;

	req->common.length = sizeof(hostdata->madapter_info);

	req->buffer = dma_map_single(hostdata->dev,

	req->buffer = addr = dma_map_single(hostdata->dev,

					    &hostdata->madapter_info,

					    sizeof(hostdata->madapter_info),

					    DMA_BIDIRECTIONAL);
@@ -770,8 +771,13 @@ static void send_mad_adapter_info(struct ibmvscsi_host_data *hostdata) 
		return;

	}

	

	if (ibmvscsi_send_srp_event(evt_struct, hostdata))

	if (ibmvscsi_send_srp_event(evt_struct, hostdata)) {

		printk(KERN_ERR "ibmvscsi: couldn't send ADAPTER_INFO_REQ!\n");

		dma_unmap_single(hostdata->dev,

				 addr,

				 sizeof(hostdata->madapter_info),

				 DMA_BIDIRECTIONAL);

	}

};



/**
@@ -1259,6 +1265,7 @@ static int ibmvscsi_do_host_config(struct ibmvscsi_host_data *hostdata, 
{

	struct viosrp_host_config *host_config;

	struct srp_event_struct *evt_struct;

	dma_addr_t addr;

	int rc;



	evt_struct = get_event_struct(&hostdata->pool);
@@ -1279,7 +1286,8 @@ static int ibmvscsi_do_host_config(struct ibmvscsi_host_data *hostdata, 
	memset(host_config, 0x00, sizeof(*host_config));

	host_config->common.type = VIOSRP_HOST_CONFIG_TYPE;

	host_config->common.length = length;

	host_config->buffer = dma_map_single(hostdata->dev, buffer, length,

	host_config->buffer = addr = dma_map_single(hostdata->dev, buffer,

						    length,

						    DMA_BIDIRECTIONAL);



	if (dma_mapping_error(host_config->buffer)) {
@@ -1291,11 +1299,9 @@ static int ibmvscsi_do_host_config(struct ibmvscsi_host_data *hostdata, 


	init_completion(&evt_struct->comp);

	rc = ibmvscsi_send_srp_event(evt_struct, hostdata);

	if (rc == 0) {

	if (rc == 0)

		wait_for_completion(&evt_struct->comp);

		dma_unmap_single(hostdata->dev, host_config->buffer,

				 length, DMA_BIDIRECTIONAL);

	}

	dma_unmap_single(hostdata->dev, addr, length, DMA_BIDIRECTIONAL);



	return rc;

}