diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-22 13:16:04 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-22 13:16:04 +0100 |
| commit | b64c670f1ddcd02d003e701f69cf573d7c559ecb (patch) | |
| tree | 9754e1eb3dcb878ee7d959fed7f786d6dbfca67b | |
| parent | 25af8e6b6106f47f5ee276545fcab47cefa67ba1 (diff) | |
| parent | 713e8a102222b6b8ca65050d13b287f5705831b0 (diff) | |
Merge remote-tracking branch 'remotes/amit-virtio-rng/for-2.1' into staging
* remotes/amit-virtio-rng/for-2.1:
virtio-rng: Add human-readable error message for negative max-bytes parameter
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/virtio/virtio-rng.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 1356aca8d6..7c5a675674 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -181,7 +181,13 @@ 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); + /* Workaround: Property parsing does not enforce unsigned integers, + * So this is a hack to reject such numbers. */ + if (vrng->conf.max_bytes > INT64_MAX) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "max-bytes", + "a non-negative integer below 2^63"); + return; + } vrng->quota_remaining = vrng->conf.max_bytes; vrng->rate_limit_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, |