提交 758ead31 编写于 作者: P Prasad J Pandit 提交者: Michael S. Tsirkin

virtio: check VirtQueue Vring object is set

A guest could attempt to use an uninitialised VirtQueue object
or unset Vring.align leading to a arithmetic exception. Add check
to avoid it.
Reported-by: NZhangboxian <zhangboxian@huawei.com>
Signed-off-by: NPrasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: NCornelia Huck <cohuck@redhat.com>
上级 2fe45ec3
...@@ -182,7 +182,7 @@ void virtio_queue_update_rings(VirtIODevice *vdev, int n) ...@@ -182,7 +182,7 @@ void virtio_queue_update_rings(VirtIODevice *vdev, int n)
{ {
VRing *vring = &vdev->vq[n].vring; VRing *vring = &vdev->vq[n].vring;
if (!vring->desc) { if (!vring->num || !vring->desc || !vring->align) {
/* not yet setup -> nothing to do */ /* not yet setup -> nothing to do */
return; return;
} }
...@@ -1414,6 +1414,9 @@ void virtio_config_modern_writel(VirtIODevice *vdev, ...@@ -1414,6 +1414,9 @@ void virtio_config_modern_writel(VirtIODevice *vdev,
void virtio_queue_set_addr(VirtIODevice *vdev, int n, hwaddr addr) void virtio_queue_set_addr(VirtIODevice *vdev, int n, hwaddr addr)
{ {
if (!vdev->vq[n].vring.num) {
return;
}
vdev->vq[n].vring.desc = addr; vdev->vq[n].vring.desc = addr;
virtio_queue_update_rings(vdev, n); virtio_queue_update_rings(vdev, n);
} }
...@@ -1426,6 +1429,9 @@ hwaddr virtio_queue_get_addr(VirtIODevice *vdev, int n) ...@@ -1426,6 +1429,9 @@ hwaddr virtio_queue_get_addr(VirtIODevice *vdev, int n)
void virtio_queue_set_rings(VirtIODevice *vdev, int n, hwaddr desc, void virtio_queue_set_rings(VirtIODevice *vdev, int n, hwaddr desc,
hwaddr avail, hwaddr used) hwaddr avail, hwaddr used)
{ {
if (!vdev->vq[n].vring.num) {
return;
}
vdev->vq[n].vring.desc = desc; vdev->vq[n].vring.desc = desc;
vdev->vq[n].vring.avail = avail; vdev->vq[n].vring.avail = avail;
vdev->vq[n].vring.used = used; vdev->vq[n].vring.used = used;
...@@ -1494,8 +1500,10 @@ void virtio_queue_set_align(VirtIODevice *vdev, int n, int align) ...@@ -1494,8 +1500,10 @@ void virtio_queue_set_align(VirtIODevice *vdev, int n, int align)
*/ */
assert(k->has_variable_vring_alignment); assert(k->has_variable_vring_alignment);
vdev->vq[n].vring.align = align; if (align) {
virtio_queue_update_rings(vdev, n); vdev->vq[n].vring.align = align;
virtio_queue_update_rings(vdev, n);
}
} }
static bool virtio_queue_notify_aio_vq(VirtQueue *vq) static bool virtio_queue_notify_aio_vq(VirtQueue *vq)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册