|
 |
b37f23 |
centosplus kernel patch [bug#12841]
|
|
|
b37f23 |
|
|
|
b37f23 |
commit b0120d9906253570f593daf82016a5331bbee2b8
|
|
|
b37f23 |
Author: Cathy Avery <cavery@redhat.com>
|
|
|
b37f23 |
Date: Wed Nov 23 08:46:33 2016 -0500
|
|
|
b37f23 |
|
|
|
b37f23 |
scsi: storvsc: Payload buffer incorrectly sized for 32 bit kernels.
|
|
|
b37f23 |
|
|
|
b37f23 |
On a 32 bit kernel sizeof(void *) is not 64 bits as hv_mpb_array
|
|
|
b37f23 |
requires. Also the buffer needs to be cleared or the upper bytes will
|
|
|
b37f23 |
contain junk.
|
|
|
b37f23 |
|
|
|
b37f23 |
Suggested-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
b37f23 |
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
|
|
b37f23 |
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
|
|
|
b37f23 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
b37f23 |
|
|
|
b37f23 |
Applied-by: Akemi Yagi <toracat@centos.org>
|
|
|
b37f23 |
|
|
|
b37f23 |
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
|
|
|
b37f23 |
index 8ccfc9e..05526b7 100644
|
|
|
b37f23 |
--- a/drivers/scsi/storvsc_drv.c
|
|
|
b37f23 |
+++ b/drivers/scsi/storvsc_drv.c
|
|
|
b37f23 |
@@ -1495,9 +1495,9 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
|
|
|
b37f23 |
if (sg_count) {
|
|
|
b37f23 |
if (sg_count > MAX_PAGE_BUFFER_COUNT) {
|
|
|
b37f23 |
|
|
|
b37f23 |
- payload_sz = (sg_count * sizeof(void *) +
|
|
|
b37f23 |
+ payload_sz = (sg_count * sizeof(u64) +
|
|
|
b37f23 |
sizeof(struct vmbus_packet_mpb_array));
|
|
|
b37f23 |
- payload = kmalloc(payload_sz, GFP_ATOMIC);
|
|
|
b37f23 |
+ payload = kzalloc(payload_sz, GFP_ATOMIC);
|
|
|
b37f23 |
if (!payload)
|
|
|
b37f23 |
return SCSI_MLQUEUE_DEVICE_BUSY;
|
|
|
b37f23 |
}
|