From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6pSc-0006km-8l for qemu-devel@nongnu.org; Mon, 14 Jul 2014 19:15:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X6pSW-0006Th-4w for qemu-devel@nongnu.org; Mon, 14 Jul 2014 19:15:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51872) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6pSV-0006TD-Rw for qemu-devel@nongnu.org; Mon, 14 Jul 2014 19:15:00 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6ENEwh4015838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Jul 2014 19:14:58 -0400 From: John Snow Date: Mon, 14 Jul 2014 19:14:43 -0400 Message-Id: <1405379683-4672-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH] virtio-rng: Add human-readable error message for negative max-bytes parameter List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, jsnow@redhat.com, stefanha@redhat.com If a negative integer is used for the max_bytes parameter, QEMU currently calls abort() and leaves behind a core dump. This patch adds a simple error message to make the reason for the termination clearer. Signed-off-by: John Snow --- hw/virtio/virtio-rng.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 1356aca..e4d2e68 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -181,7 +181,11 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) vrng->vq = virtio_add_queue(vdev, 8, handle_input); - assert(vrng->conf.max_bytes <= INT64_MAX); + if (vrng->conf.max_bytes > INT64_MAX) { + error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "virtio-rng", + "max_bytes", vrng->conf.max_bytes, 0L, INT64_MAX); + return; + } vrng->quota_remaining = vrng->conf.max_bytes; vrng->rate_limit_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, -- 1.9.3