qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH v2] virtio-rng: Add human-readable error message for negative max-bytes parameter
@ 2014-07-17 20:47 John Snow
  2014-07-18  6:27 ` Markus Armbruster
  0 siblings, 1 reply; 19+ messages in thread
From: John Snow @ 2014-07-17 20:47 UTC (permalink / raw)
  To: qemu-devel; +Cc: amit.shah, peter.maydell, jsnow

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 <jsnow@redhat.com>
---
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

^ permalink raw reply related	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2014-07-21 20:31 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-17 20:47 [Qemu-devel] [PATCH v2] virtio-rng: Add human-readable error message for negative max-bytes parameter John Snow
2014-07-18  6:27 ` Markus Armbruster
2014-07-18  7:46   ` Amit Shah
2014-07-18 11:15     ` Markus Armbruster
2014-07-18 11:27       ` Amit Shah
2014-07-18 11:54         ` Markus Armbruster
2014-07-18 12:14           ` Amit Shah
2014-07-18 13:16             ` Markus Armbruster
2014-07-18 16:22               ` John Snow
2014-07-21  7:38                 ` Markus Armbruster
2014-07-18 21:14               ` John Snow
2014-07-18 21:53                 ` Eric Blake
2014-07-21  7:48                 ` Markus Armbruster
2014-07-21 15:44                   ` John Snow
2014-07-21 17:33                     ` Markus Armbruster
2014-07-21 17:53                       ` John Snow
2014-07-21 19:15                         ` Markus Armbruster
2014-07-21 20:13                           ` John Snow
2014-07-21 20:31                             ` Eric Blake

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).