david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio-rng: Move error-checking forward to prevent memory leak

Browse Source 
This patch pushes the error-checking forward and the virtio
initialization backward in the device realization function
in order to prevent memory leaks for hot plug scenarios.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
John Snow 2014-07-29 19:28:57 -04:00 committed by Amit Shah
parent c79805802b
commit 1efd6e072c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/virtio/virtio-rng.c
View File

@ -147,6 +147,14 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp)
return;
}
/* 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;
}
if (vrng->conf.rng == NULL) {
vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM));
@ -171,23 +179,15 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp)
"rng", NULL);
}
virtio_init(vdev, "virtio-rng", VIRTIO_ID_RNG, 0);
vrng->rng = vrng->conf.rng;
if (vrng->rng == NULL) {
error_set(errp, QERR_INVALID_PARAMETER_VALUE, "rng", "a valid object");
return;
}
vrng->vq = virtio_add_queue(vdev, 8, handle_input);
virtio_init(vdev, "virtio-rng", VIRTIO_ID_RNG, 0);
/* 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->vq = virtio_add_queue(vdev, 8, handle_input);
vrng->quota_remaining = vrng->conf.max_bytes;
vrng->rate_limit_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL,