[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 5/9] virtio: handle virtqueue_get_avail_bytes() err
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [RFC v2 5/9] virtio: handle virtqueue_get_avail_bytes() errors |
Date: |
Tue, 29 Mar 2016 17:12:57 +0100 |
If the vring is invalid, tell the caller no bytes are available and mark
the device broken.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/virtio/virtio.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index c07b451..a7459c2 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -399,14 +399,14 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned
int *in_bytes,
if (desc.flags & VRING_DESC_F_INDIRECT) {
if (desc.len % sizeof(VRingDesc)) {
- error_report("Invalid size for indirect buffer table");
- exit(1);
+ virtio_error(vdev, "Invalid size for indirect buffer table");
+ goto err;
}
/* If we've got too many, that implies a descriptor loop. */
if (num_bufs >= max) {
- error_report("Looped descriptor");
- exit(1);
+ virtio_error(vdev, "Looped descriptor");
+ goto err;
}
/* loop over the indirect descriptor table */
@@ -420,8 +420,8 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int
*in_bytes,
do {
/* If we've got too many, that implies a descriptor loop. */
if (++num_bufs > max) {
- error_report("Looped descriptor");
- exit(1);
+ virtio_error(vdev, "Looped descriptor");
+ goto err;
}
if (desc.flags & VRING_DESC_F_WRITE) {
@@ -446,6 +446,11 @@ done:
if (out_bytes) {
*out_bytes = out_total;
}
+ return;
+
+err:
+ in_total = out_total = 0;
+ goto done;
}
int virtqueue_avail_bytes(VirtQueue *vq, unsigned int in_bytes,
--
2.5.5
- [Qemu-devel] [RFC v2 0/9] virtio: avoid exit() when device enters invalid states, Stefan Hajnoczi, 2016/03/29
- [Qemu-devel] [RFC v2 1/9] virtio: fix stray tab character, Stefan Hajnoczi, 2016/03/29
- [Qemu-devel] [RFC v2 2/9] include: update virtio_config.h Linux header, Stefan Hajnoczi, 2016/03/29
- [Qemu-devel] [RFC v2 3/9] virtio: stop virtqueue processing if device is broken, Stefan Hajnoczi, 2016/03/29
- [Qemu-devel] [RFC v2 6/9] virtio: use unsigned int for virtqueue_get_avail_bytes() index, Stefan Hajnoczi, 2016/03/29
- [Qemu-devel] [RFC v2 4/9] virtio: handle virtqueue_map_desc() errors, Stefan Hajnoczi, 2016/03/29
- [Qemu-devel] [RFC v2 5/9] virtio: handle virtqueue_get_avail_bytes() errors,
Stefan Hajnoczi <=
- [Qemu-devel] [RFC v2 9/9] virtio: handle virtqueue_get_head() errors, Stefan Hajnoczi, 2016/03/29
- [Qemu-devel] [RFC v2 7/9] virtio: handle virtqueue_read_next_desc() errors, Stefan Hajnoczi, 2016/03/29
- [Qemu-devel] [RFC v2 8/9] virtio: handle virtqueue_num_heads() errors, Stefan Hajnoczi, 2016/03/29