david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost: fix invalid downcast

Browse Source 
virtio_queue_get_desc_addr returns 64-bit hwaddr while int is usually 32-bit.
If returned hwaddr is not equal to 0 but least-significant 32 bits are
equal to 0 then this code will not actually stop running queue.

Signed-off-by: Yury Kotov <yury-kotov@yandex-team.ru>
Acked-by: Jia He <hejianet@gmail.com>
Cc: qemu-stable@nongnu.org
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Yury Kotov 2018-07-13 17:04:05 +03:00 committed by Michael S. Tsirkin
parent c2d2a81b41
commit fa4ae4be15
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/virtio/vhost.c
View File

@ -1073,10 +1073,8 @@ static void vhost_virtqueue_stop(struct vhost_dev *dev,
.index = vhost_vq_index, .index = vhost_vq_index,
}; };
int r; int r;
int a;
a = virtio_queue_get_desc_addr(vdev, idx); if (virtio_queue_get_desc_addr(vdev, idx) == 0) {
if (a == 0) {
/* Don't stop the virtqueue which might have not been started */ /* Don't stop the virtqueue which might have not been started */
return; return;
} }