From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7scM-00067n-EL for qemu-devel@nongnu.org; Thu, 17 Jul 2014 16:49:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7scF-0004up-CZ for qemu-devel@nongnu.org; Thu, 17 Jul 2014 16:49:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37809) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7scF-0004uV-4F for qemu-devel@nongnu.org; Thu, 17 Jul 2014 16:49:23 -0400 From: John Snow Date: Thu, 17 Jul 2014 16:47:33 -0400 Message-Id: <1405630053-15052-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2] 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, peter.maydell@linaro.org, jsnow@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 --- v2: Changed 0L constant to (uint64_t)0 constant to match PRId64 format code on both 32bit and 64bit systems. Tested via -m32 flag. 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..64c7d23 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, (uint64_t)0, INT64_MAX); + return; + } vrng->quota_remaining = vrng->conf.max_bytes; vrng->rate_limit_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, -- 1.9.3