Commit 64b840dd authored Jan 22, 2009 by Brian King Committed by James Bottomley Jan 25, 2009

[SCSI] ibmvfc: Fix DMA mapping leak on memory allocation failure

There is currently a DMA mapping leak that can occur in the ibmvfc
driver if we fail to allocate a scatterlist. Fix this by unmapping
the scatterlist in the failure path. Additionally, only log an error
for a scatterlist allocation failure if the log level is greater
than the default, since this can occur when running Active Memory
Sharing and this is not considered an error.

Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent f9932deb

drivers/scsi/ibmvscsi/ibmvfc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1322,6 +1322,8 @@ static int ibmvfc_map_sg_data(struct scsi_cmnd *scmd,
		&evt->ext_list_token);

		if (!evt->ext_list) {
		scsi_dma_unmap(scmd);
		if (vhost->log_level > IBMVFC_DEFAULT_LOG_LEVEL)
		scmd_printk(KERN_ERR, scmd, "Can't allocate memory for scatterlist\n");
		return -ENOMEM;
		}