2016-11-23 13:47:08

by Cathy Avery

Subject: [PATCH v2] [hv] storvsc: Payload buffer incorrectly sized for 32 bit kernels.

On a 32 bit kernel sizeof(void *) is not 64 bits as hv_mpb_array
requires. Also the buffer needs to be cleared or the upper bytes
will contain junk.

Suggested-by: Vitaly Kuznetsov <[email protected]>
Signed-off-by: Cathy Avery <[email protected]>

ChangeLog:

v1) Initial submission
v2) Remove memset and replace kmalloc with kzalloc.
---
drivers/scsi/storvsc_drv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 8ccfc9e..05526b7 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1495,9 +1495,9 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
if (sg_count) {
if (sg_count > MAX_PAGE_BUFFER_COUNT) {

- payload_sz = (sg_count * sizeof(void *) +
+ payload_sz = (sg_count * sizeof(u64) +
sizeof(struct vmbus_packet_mpb_array));
- payload = kmalloc(payload_sz, GFP_ATOMIC);
+ payload = kzalloc(payload_sz, GFP_ATOMIC);
if (!payload)
return SCSI_MLQUEUE_DEVICE_BUSY;
}
--
2.5.0

2016-11-29 16:58:11

by Martin K. Petersen

Subject: Re: [PATCH v2] [hv] storvsc: Payload buffer incorrectly sized for 32 bit kernels.

>>>>> "Cathy" == Cathy Avery <[email protected]> writes:

Cathy> On a 32 bit kernel sizeof(void *) is not 64 bits as hv_mpb_array
Cathy> requires. Also the buffer needs to be cleared or the upper bytes
Cathy> will contain junk.

K.Y.: Please review!

--
Martin K. Petersen Oracle Linux Engineering

2016-11-30 06:17:38

by KY Srinivasan

Subject: RE: [PATCH v2] [hv] storvsc: Payload buffer incorrectly sized for 32 bit kernels.

> -----Original Message-----
> From: Martin K. Petersen [mailto:[email protected]]
> Sent: Tuesday, November 29, 2016 8:58 AM
> To: Cathy Avery <[email protected]>
> Cc: KY Srinivasan <[email protected]>; Haiyang Zhang
> <[email protected]>; [email protected];
> [email protected]; [email protected]; linux-
> [email protected]; [email protected]
> Subject: Re: [PATCH v2] [hv] storvsc: Payload buffer incorrectly sized for 32
> bit kernels.
>
> >>>>> "Cathy" == Cathy Avery <[email protected]> writes:
>
> Cathy> On a 32 bit kernel sizeof(void *) is not 64 bits as hv_mpb_array
> Cathy> requires. Also the buffer needs to be cleared or the upper bytes
> Cathy> will contain junk.
>
> K.Y.: Please review!

Done.

K. Y
>
> --
> Martin K. Petersen Oracle Linux Engineering

2016-11-30 06:30:53

by KY Srinivasan

Subject: RE: [PATCH v2] [hv] storvsc: Payload buffer incorrectly sized for 32 bit kernels.

> -----Original Message-----
> From: Cathy Avery [mailto:[email protected]]
> Sent: Wednesday, November 23, 2016 5:47 AM
> To: KY Srinivasan <[email protected]>; Haiyang Zhang
> <[email protected]>; [email protected];
> [email protected]
> Cc: [email protected]; [email protected]; linux-
> [email protected]
> Subject: [PATCH v2] [hv] storvsc: Payload buffer incorrectly sized for 32 bit
> kernels.
>
> On a 32 bit kernel sizeof(void *) is not 64 bits as hv_mpb_array
> requires. Also the buffer needs to be cleared or the upper bytes
> will contain junk.
>
> Suggested-by: Vitaly Kuznetsov <[email protected]>
> Signed-off-by: Cathy Avery <[email protected]>

Thanks Cathy.

Reviewed-by: K. Y. Srinivasan <[email protected]>
>
> ChangeLog:
>
> v1) Initial submission
> v2) Remove memset and replace kmalloc with kzalloc.
> ---
> drivers/scsi/storvsc_drv.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
> index 8ccfc9e..05526b7 100644
> --- a/drivers/scsi/storvsc_drv.c
> +++ b/drivers/scsi/storvsc_drv.c
> @@ -1495,9 +1495,9 @@ static int storvsc_queuecommand(struct Scsi_Host
> *host, struct scsi_cmnd *scmnd)
> if (sg_count) {
> if (sg_count > MAX_PAGE_BUFFER_COUNT) {
>
> - payload_sz = (sg_count * sizeof(void *) +
> + payload_sz = (sg_count * sizeof(u64) +
> sizeof(struct vmbus_packet_mpb_array));
> - payload = kmalloc(payload_sz, GFP_ATOMIC);
> + payload = kzalloc(payload_sz, GFP_ATOMIC);
> if (!payload)
> return SCSI_MLQUEUE_DEVICE_BUSY;
> }
> --
> 2.5.0

2016-11-30 16:39:31

by Martin K. Petersen

Subject: Re: [PATCH v2] [hv] storvsc: Payload buffer incorrectly sized for 32 bit kernels.

>>>>> "Cathy" == Cathy Avery <[email protected]> writes:

Cathy> On a 32 bit kernel sizeof(void *) is not 64 bits as hv_mpb_array
Cathy> requires. Also the buffer needs to be cleared or the upper bytes
Cathy> will contain junk.

Applied to 4.10/scsi-queue.

--
Martin K. Petersen Oracle Linux Engineering

2016-11-30 16:39:54

by Martin K. Petersen

Subject: Re: [PATCH v2] [hv] storvsc: Payload buffer incorrectly sized for 32 bit kernels.

>>>>> "KY" == KY Srinivasan <[email protected]> writes:

KY> Done.

Thank you!

--
Martin K. Petersen Oracle Linux Engineering