From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj9VM-0006u2-HX for qemu-devel@nongnu.org; Thu, 24 Mar 2016 13:57:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aj9VL-0003SP-Gm for qemu-devel@nongnu.org; Thu, 24 Mar 2016 13:57:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41871) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj9VL-0003S4-Bc for qemu-devel@nongnu.org; Thu, 24 Mar 2016 13:57:07 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id E6B4C711C6 for ; Thu, 24 Mar 2016 17:57:06 +0000 (UTC) From: Stefan Hajnoczi Date: Thu, 24 Mar 2016 17:56:51 +0000 Message-Id: <1458842214-11450-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1458842214-11450-1-git-send-email-stefanha@redhat.com> References: <1458842214-11450-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [RFC 4/7] virtio: handle virtqueue_get_avail_bytes() errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng , Stefan Hajnoczi , "Michael S. Tsirkin" If the vring is invalid, tell the caller no bytes are available and mark the device broken. Signed-off-by: Stefan Hajnoczi --- 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 86352c8..4758fe3 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