summaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJuan Vazquez <juvazq@linux.microsoft.com>2022-01-09 03:17:58 +0300
committerWei Liu <wei.liu@kernel.org>2022-01-10 15:33:47 +0300
commit4eea5332d67d8ae6ba5717ec0f4e671fdbd222e7 (patch)
tree919efd6d1cbff7eb6063fa9e68fdb83760b7421d /drivers/scsi
parent51500b71d500f251037ed339047a4d9e7d7e295b (diff)
downloadlinux-4eea5332d67d8ae6ba5717ec0f4e671fdbd222e7.tar.xz
scsi: storvsc: Fix storvsc_queuecommand() memory leak
Fix possible memory leak in error path of storvsc_queuecommand() when DMA mapping fails. Signed-off-by: Juan Vazquez <juvazq@linux.microsoft.com> Reviewed-by: Tianyu Lan <Tianyu.Lan@microsoft.com> Link: https://lore.kernel.org/r/20220109001758.6401-1-juvazq@linux.microsoft.com Signed-off-by: Wei Liu <wei.liu@kernel.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/storvsc_drv.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 2273b843d9d2..9a0bba5a51a7 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1850,8 +1850,10 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
payload->range.offset = offset_in_hvpg;
sg_count = scsi_dma_map(scmnd);
- if (sg_count < 0)
- return SCSI_MLQUEUE_DEVICE_BUSY;
+ if (sg_count < 0) {
+ ret = SCSI_MLQUEUE_DEVICE_BUSY;
+ goto err_free_payload;
+ }
for_each_sg(sgl, sg, sg_count, j) {
/*
@@ -1886,13 +1888,18 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
put_cpu();
if (ret == -EAGAIN) {
- if (payload_sz > sizeof(cmd_request->mpb))
- kfree(payload);
/* no more space */
- return SCSI_MLQUEUE_DEVICE_BUSY;
+ ret = SCSI_MLQUEUE_DEVICE_BUSY;
+ goto err_free_payload;
}
return 0;
+
+err_free_payload:
+ if (payload_sz > sizeof(cmd_request->mpb))
+ kfree(payload);
+
+ return ret;
}
static struct scsi_host_template scsi_driver = {