From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: amit.shah@redhat.com, jsnow@redhat.com, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH] virtio-rng: Add human-readable error message for negative max-bytes parameter
Date: Mon, 14 Jul 2014 19:14:43 -0400 [thread overview]
Message-ID: <1405379683-4672-1-git-send-email-jsnow@redhat.com> (raw)
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>
---
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
next reply other threads:[~2014-07-14 23:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-14 23:14 John Snow [this message]
2014-07-15 4:51 ` [Qemu-devel] [PATCH] virtio-rng: Add human-readable error message for negative max-bytes parameter Amit Shah
2014-07-15 9:18 ` Stefan Hajnoczi
2014-07-15 9:21 ` Amit Shah
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405379683-4672-1-git-send-email-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=amit.shah@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).