From patchwork Fri Jun 4 16:33:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 54638 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DC568B6ED0 for ; Sat, 5 Jun 2010 02:54:54 +1000 (EST) Received: from localhost ([127.0.0.1]:35860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKaAV-0000Bj-OE for incoming@patchwork.ozlabs.org; Fri, 04 Jun 2010 12:54:51 -0400 Received: from [140.186.70.92] (port=44912 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKZtA-0007gF-Tx for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:36:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKZt8-0002eQ-4u for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:36:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56277) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKZt7-0002eJ-Ns for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:36:54 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o54GapQS026633 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 4 Jun 2010 12:36:51 -0400 Received: from localhost.localdomain (vpn2-9-144.ams2.redhat.com [10.36.9.144]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o54GXWSw032074; Fri, 4 Jun 2010 12:36:39 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Fri, 4 Jun 2010 18:33:03 +0200 Message-Id: <1275669195-28312-16-git-send-email-kwolf@redhat.com> In-Reply-To: <1275669195-28312-1-git-send-email-kwolf@redhat.com> References: <1275669195-28312-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 15/27] qdev: Don't leak string property value on hot unplug X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster parse_string() qemu_strdup()s the property value. It is never freed. It needs to be freed along with the device. Otherwise, the value of scsi-disk property "ver" gets leaked when hot-unplugging the disk, for instance. Call new PropertyInfo method free() from qdev_free(). Implement it for qdev_prop_string. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/qdev-properties.c | 6 ++++++ hw/qdev.c | 6 ++++++ hw/qdev.h | 1 + 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index b6ee50f..48a6b45 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -260,6 +260,11 @@ static int parse_string(DeviceState *dev, Property *prop, const char *str) return 0; } +static void free_string(DeviceState *dev, Property *prop) +{ + qemu_free(*(char **)qdev_get_prop_ptr(dev, prop)); +} + static int print_string(DeviceState *dev, Property *prop, char *dest, size_t len) { char **ptr = qdev_get_prop_ptr(dev, prop); @@ -274,6 +279,7 @@ PropertyInfo qdev_prop_string = { .size = sizeof(char*), .parse = parse_string, .print = print_string, + .free = free_string, }; /* --- drive --- */ diff --git a/hw/qdev.c b/hw/qdev.c index aa2ce01..29f6e9f 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -334,6 +334,7 @@ void qdev_init_nofail(DeviceState *dev) void qdev_free(DeviceState *dev) { BusState *bus; + Property *prop; if (dev->state == DEV_STATE_INITIALIZED) { while (dev->num_child_bus) { @@ -349,6 +350,11 @@ void qdev_free(DeviceState *dev) } qemu_unregister_reset(qdev_reset, dev); QLIST_REMOVE(dev, sibling); + for (prop = dev->info->props; prop && prop->name; prop++) { + if (prop->info->free) { + prop->info->free(dev, prop); + } + } qemu_free(dev); } diff --git a/hw/qdev.h b/hw/qdev.h index 7c25a94..51a24e2 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -98,6 +98,7 @@ struct PropertyInfo { enum PropertyType type; int (*parse)(DeviceState *dev, Property *prop, const char *str); int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len); + void (*free)(DeviceState *dev, Property *prop); }; typedef struct GlobalProperty {