From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViPFD-0004ku-6D for qemu-devel@nongnu.org; Mon, 18 Nov 2013 08:52:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ViPF7-0000eu-7d for qemu-devel@nongnu.org; Mon, 18 Nov 2013 08:52:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22400) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViPF6-0000ec-Vl for qemu-devel@nongnu.org; Mon, 18 Nov 2013 08:51:57 -0500 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 rAIDptLc005828 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 18 Nov 2013 08:51:55 -0500 Date: Mon, 18 Nov 2013 15:55:08 +0200 From: "Michael S. Tsirkin" Message-ID: <20131118135508.GA7233@redhat.com> References: <1384782445-26527-1-git-send-email-akong@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1384782445-26527-1-git-send-email-akong@redhat.com> Subject: Re: [Qemu-devel] [PATCH] virtio-net: fix the memory leak in rxfilter_notify() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amos Kong Cc: vyasevic@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com On Mon, Nov 18, 2013 at 09:47:25PM +0800, Amos Kong wrote: > object_get_canonical_path() returns a gchar*, it should be freeed by the > caller. > > Signed-off-by: Amos Kong Reviewed-by: Michael S. Tsirkin > --- > hw/net/virtio-net.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index 613f144..2b2fb57 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -198,15 +198,14 @@ static void rxfilter_notify(NetClientState *nc) > { > QObject *event_data; > VirtIONet *n = qemu_get_nic_opaque(nc); > + gchar *path = object_get_canonical_path(OBJECT(n->qdev)); > > if (nc->rxfilter_notify_enabled) { It would be a bit nicer to put gchar *path within this scope. > if (n->netclient_name) { > event_data = qobject_from_jsonf("{ 'name': %s, 'path': %s }", > - n->netclient_name, > - object_get_canonical_path(OBJECT(n->qdev))); > + n->netclient_name, path); > } else { > - event_data = qobject_from_jsonf("{ 'path': %s }", > - object_get_canonical_path(OBJECT(n->qdev))); > + event_data = qobject_from_jsonf("{ 'path': %s }", path); > } > monitor_protocol_event(QEVENT_NIC_RX_FILTER_CHANGED, event_data); > qobject_decref(event_data); > @@ -214,6 +213,7 @@ static void rxfilter_notify(NetClientState *nc) > /* disable event notification to avoid events flooding */ > nc->rxfilter_notify_enabled = 0; > } > + g_free(path); > } > > static char *mac_strdup_printf(const uint8_t *mac) > -- > 1.8.3.1