[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 5/9] virtio-net: handle virtio_net_handle_ctrl()
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PATCH v3 5/9] virtio-net: handle virtio_net_handle_ctrl() error |
Date: |
Mon, 26 Sep 2016 10:34:32 +0200 |
User-agent: |
StGit/0.17.1-dirty |
This error is caused by a buggy guest: let's switch the device to the
broken state instead of terminating QEMU. Also we detach the element
from the virtqueue and free it.
Signed-off-by: Greg Kurz <address@hidden>
---
v3: - detach and free element
- updated changelog
---
hw/net/virtio-net.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 01f1351554aa..2c02ba8a70a4 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -875,6 +875,7 @@ static int virtio_net_handle_mq(VirtIONet *n, uint8_t cmd,
return VIRTIO_NET_OK;
}
+
static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
{
VirtIONet *n = VIRTIO_NET(vdev);
@@ -892,8 +893,10 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev,
VirtQueue *vq)
}
if (iov_size(elem->in_sg, elem->in_num) < sizeof(status) ||
iov_size(elem->out_sg, elem->out_num) < sizeof(ctrl)) {
- error_report("virtio-net ctrl missing headers");
- exit(1);
+ virtio_error(vdev, "virtio-net ctrl missing headers");
+ virtqueue_detach_element(vq, elem, 0);
+ g_free(elem);
+ break;
}
iov_cnt = elem->out_num;
- [Qemu-devel] [PATCH v3 0/9] virtio: avoid inappropriate QEMU termination, Greg Kurz, 2016/09/26
- [Qemu-devel] [PATCH v3 1/9] virtio-9p: add parentheses to sizeof operator, Greg Kurz, 2016/09/26
- [Qemu-devel] [PATCH v3 2/9] virtio-blk: make some functions static, Greg Kurz, 2016/09/26
- [Qemu-devel] [PATCH v3 3/9] virtio-9p: handle handle_9p_output() error, Greg Kurz, 2016/09/26
- [Qemu-devel] [PATCH v3 4/9] virtio-blk: handle virtio_blk_handle_request() errors, Greg Kurz, 2016/09/26
- [Qemu-devel] [PATCH v3 5/9] virtio-net: handle virtio_net_handle_ctrl() error,
Greg Kurz <=
- [Qemu-devel] [PATCH v3 6/9] virtio-net: handle virtio_net_receive() errors, Greg Kurz, 2016/09/26
- [Qemu-devel] [PATCH v3 7/9] virtio-net: handle virtio_net_flush_tx() errors, Greg Kurz, 2016/09/26
- [Qemu-devel] [PATCH v3 8/9] virtio-scsi: convert virtio_scsi_bad_req() to use virtio_error(), Greg Kurz, 2016/09/26
- [Qemu-devel] [PATCH v3 9/9] virtio-scsi: handle virtio_scsi_set_config() error, Greg Kurz, 2016/09/26