From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCGpm-0005Gi-5j for qemu-devel@nongnu.org; Tue, 29 Jul 2014 19:29:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCGpc-0006JI-Ld for qemu-devel@nongnu.org; Tue, 29 Jul 2014 19:29:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42859) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCGpc-0006JE-Cz for qemu-devel@nongnu.org; Tue, 29 Jul 2014 19:29:20 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6TNTJh4028104 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 29 Jul 2014 19:29:19 -0400 From: John Snow Date: Tue, 29 Jul 2014 19:28:57 -0400 Message-Id: <1406676538-23149-2-git-send-email-jsnow@redhat.com> In-Reply-To: <1406676538-23149-1-git-send-email-jsnow@redhat.com> References: <1406676538-23149-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] virtio-rng: Move error-checking forward to prevent memory leak List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, jsnow@redhat.com, armbru@redhat.com, stefanha@redhat.com, lcapitulino@redhat.com 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 --- hw/virtio/virtio-rng.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 7c5a675..ff58917 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -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, -- 1.9.3