2022-01-09 00:18:12

by Juan Vazquez

Subject: [PATCH] scsi: storvsc: Fix storvsc_queuecommand() memory leak

Fix possible memory leak in error path of storvsc_queuecommand() when
DMA mapping fails.

Fixes: 743b237c3a7b ("scsi: storvsc: Add Isolation VM support for storvsc driver")
Signed-off-by: Juan Vazquez <[email protected]>
---
drivers/scsi/storvsc_drv.c | 17 ++++++++++++-----
1 file 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 = {
--
2.32.0

2022-01-10 11:56:28

by Wei Liu

Subject: Re: [PATCH] scsi: storvsc: Fix storvsc_queuecommand() memory leak

On Sat, Jan 08, 2022 at 04:17:58PM -0800, Juan Vazquez wrote:
> Fix possible memory leak in error path of storvsc_queuecommand() when
> DMA mapping fails.
>
> Fixes: 743b237c3a7b ("scsi: storvsc: Add Isolation VM support for storvsc driver")
> Signed-off-by: Juan Vazquez <[email protected]>

Martin, I can pick this up since the offending commit is not yet in
Linus' tree.

Tianyu, Long and Michael, the change makes sense to me but can you give
an ack or review here?

> ---
> drivers/scsi/storvsc_drv.c | 17 ++++++++++++-----
> 1 file 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 = {
> --
> 2.32.0
>

2022-01-10 12:15:06

by Tianyu Lan

Subject: Re: [PATCH] scsi: storvsc: Fix storvsc_queuecommand() memory leak

On 1/9/2022 8:17 AM, Juan Vazquez wrote:
> Fix possible memory leak in error path of storvsc_queuecommand() when
> DMA mapping fails.
>
> Fixes: 743b237c3a7b ("scsi: storvsc: Add Isolation VM support for storvsc driver")
> Signed-off-by: Juan Vazquez <[email protected]>

Looks good. Thanks for the fix patch.

Reviewed-by: Tianyu Lan <[email protected]>

> ---
> drivers/scsi/storvsc_drv.c | 17 ++++++++++++-----
> 1 file 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 = {

2022-01-10 12:32:56

by Wei Liu

Subject: Re: [PATCH] scsi: storvsc: Fix storvsc_queuecommand() memory leak

On Mon, Jan 10, 2022 at 08:13:33PM +0800, Tianyu Lan wrote:
> On 1/9/2022 8:17 AM, Juan Vazquez wrote:
> > Fix possible memory leak in error path of storvsc_queuecommand() when
> > DMA mapping fails.
> >
> > Fixes: 743b237c3a7b ("scsi: storvsc: Add Isolation VM support for storvsc driver")
> > Signed-off-by: Juan Vazquez <[email protected]>
>
> Looks good. Thanks for the fix patch.
>
> Reviewed-by: Tianyu Lan <[email protected]>

Applied. Thanks.