microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

virtio/s390: size of SET_IND payload 

SET_IND takes as a payload the _address_ of the indicators, meaning
that we have one of the rare cases where kmalloc(sizeof(&...)) is
actually correct. Let's clarify that with a comment.

The count for the ccw, however, was only correct because the
indicators are 64 bit. Let's use the correct value.

Reported-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Cornelia Huck 2016-03-01 13:44:53 +01:00 коммит произвёл Michael S. Tsirkin
Родитель 15e90f526b
Коммит c235082b50
1 изменённых файлов: 8 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
drivers/s390/virtio/virtio_ccw.c
Просмотреть файл

@ -342,13 +342,14 @@ static void virtio_ccw_drop_indicator(struct virtio_ccw_device *vcdev,
ccw->count = sizeof(*thinint_area); ccw->count = sizeof(*thinint_area);
ccw->cda = (__u32)(unsigned long) thinint_area; ccw->cda = (__u32)(unsigned long) thinint_area;
} else { } else {
/* payload is the address of the indicators */
indicatorp = kmalloc(sizeof(&vcdev->indicators), indicatorp = kmalloc(sizeof(&vcdev->indicators),
GFP_DMA | GFP_KERNEL); GFP_DMA | GFP_KERNEL);
if (!indicatorp) if (!indicatorp)
return; return;
*indicatorp = 0; *indicatorp = 0;
ccw->cmd_code = CCW_CMD_SET_IND; ccw->cmd_code = CCW_CMD_SET_IND;
ccw->count = sizeof(vcdev->indicators); ccw->count = sizeof(&vcdev->indicators);
ccw->cda = (__u32)(unsigned long) indicatorp; ccw->cda = (__u32)(unsigned long) indicatorp;
} }
/* Deregister indicators from host. */ /* Deregister indicators from host. */
@ -656,7 +657,10 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,
} }
} }
ret = -ENOMEM; ret = -ENOMEM;
/* We need a data area under 2G to communicate. */ /*
* We need a data area under 2G to communicate. Our payload is
* the address of the indicators.
*/
indicatorp = kmalloc(sizeof(&vcdev->indicators), GFP_DMA | GFP_KERNEL); indicatorp = kmalloc(sizeof(&vcdev->indicators), GFP_DMA | GFP_KERNEL);
if (!indicatorp) if (!indicatorp)
goto out; goto out;
@ -672,7 +676,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,
vcdev->indicators = 0; vcdev->indicators = 0;
ccw->cmd_code = CCW_CMD_SET_IND; ccw->cmd_code = CCW_CMD_SET_IND;
ccw->flags = 0; ccw->flags = 0;
ccw->count = sizeof(vcdev->indicators); ccw->count = sizeof(&vcdev->indicators);
ccw->cda = (__u32)(unsigned long) indicatorp; ccw->cda = (__u32)(unsigned long) indicatorp;
ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_SET_IND); ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_SET_IND);
if (ret) if (ret)
@ -683,7 +687,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,
vcdev->indicators2 = 0; vcdev->indicators2 = 0;
ccw->cmd_code = CCW_CMD_SET_CONF_IND; ccw->cmd_code = CCW_CMD_SET_CONF_IND;
ccw->flags = 0; ccw->flags = 0;
ccw->count = sizeof(vcdev->indicators2); ccw->count = sizeof(&vcdev->indicators2);
ccw->cda = (__u32)(unsigned long) indicatorp; ccw->cda = (__u32)(unsigned long) indicatorp;
ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_SET_CONF_IND); ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_SET_CONF_IND);
if (ret) if (ret)