Commit 5b8f80d3 authored Aug 28, 2017 by Long Li Committed by Greg Kroah-Hartman Sep 27, 2017

scsi: storvsc: fix memory leak on ring buffer busy



commit 0208eeaa650c5c866a3242201678a19e6dc4a14e upstream.

When storvsc is sending I/O to Hyper-v, it may allocate a bigger buffer
descriptor for large data payload that can't fit into a pre-allocated
buffer descriptor. This bigger buffer is freed on return path.

If I/O request to Hyper-v fails due to ring buffer busy, the storvsc
allocated buffer descriptor should also be freed.

[mkp: applied by hand]

Fixes: be0cf6ca ("scsi: storvsc: Set the tablesize based on the information given by the host")
Signed-off-by: Long Li <longli@microsoft.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d8817f5f

drivers/scsi/storvsc_drv.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1559,6 +1559,8 @@ static int storvsc_queuecommand(struct Scsi_Host host, struct scsi_cmnd scmnd)
		ret = storvsc_do_io(dev, cmd_request);

		if (ret == -EAGAIN) {
		if (payload_sz > sizeof(cmd_request->mpb))
		kfree(payload);
		/* no more space */
		return SCSI_MLQUEUE_DEVICE_BUSY;
		}