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

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

[Cathy Avery]

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 <vkuznets@redhat.com>
Signed-off-by: Cathy Avery <cavery@redhat.com>

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

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

[Martin K. Petersen]

>>>>> "Cathy" == Cathy Avery <cavery@redhat.com> 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

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

[KY Srinivasan]

> -----Original Message-----
> From: Martin K. Petersen [mailto:martin.petersen@oracle.com]
> Sent: Tuesday, November 29, 2016 8:58 AM
> To: Cathy Avery <cavery@redhat.com>
> Cc: KY Srinivasan <kys@microsoft.com>; Haiyang Zhang
> <haiyangz@microsoft.com>; jejb@linux.vnet.ibm.com;
> martin.petersen@oracle.com; devel@linuxdriverproject.org; linux-
> kernel@vger.kernel.org; linux-scsi@vger.kernel.org
> Subject: Re: [PATCH v2] [hv] storvsc: Payload buffer incorrectly sized for 32
> bit kernels.
> 
> >>>>> "Cathy" == Cathy Avery <cavery@redhat.com> 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

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

[Martin K. Petersen]

>>>>> "KY" == KY Srinivasan <kys@microsoft.com> writes:

KY> Done.

Thank you!

-- 
Martin K. Petersen	Oracle Linux Engineering

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

[KY Srinivasan]

> -----Original Message-----
> From: Cathy Avery [mailto:cavery@redhat.com]
> Sent: Wednesday, November 23, 2016 5:47 AM
> To: KY Srinivasan <kys@microsoft.com>; Haiyang Zhang
> <haiyangz@microsoft.com>; jejb@linux.vnet.ibm.com;
> martin.petersen@oracle.com
> Cc: devel@linuxdriverproject.org; linux-kernel@vger.kernel.org; linux-
> scsi@vger.kernel.org
> 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 <vkuznets@redhat.com>
> Signed-off-by: Cathy Avery <cavery@redhat.com>

Thanks Cathy.

Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
> 
> 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

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

[Martin K. Petersen]

>>>>> "Cathy" == Cathy Avery <cavery@redhat.com> 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