|
 |
9ae3a8 |
From 7bbc53ba5ca8c488498cc1f8a66de4e3bad5372c Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <7bbc53ba5ca8c488498cc1f8a66de4e3bad5372c.1387276076.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <e610718166120379517e80d1a7aa12d60294209b.1387276076.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <e610718166120379517e80d1a7aa12d60294209b.1387276076.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
Date: Sat, 23 Nov 2013 03:17:43 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 03/16] virtio-net: fix the memory leak in rxfilter_notify()
|
|
|
9ae3a8 |
MIME-Version: 1.0
|
|
|
9ae3a8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9ae3a8 |
Content-Transfer-Encoding: 8bit
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1385176664-3852-2-git-send-email-akong@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 55866
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 1/2] virtio-net: fix the memory leak in rxfilter_notify()
|
|
|
9ae3a8 |
Bugzilla: 1033810
|
|
|
9ae3a8 |
RH-Acked-by: Vlad Yasevich <vyasevic@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
object_get_canonical_path() returns a gchar*, it should be freed by the
|
|
|
9ae3a8 |
caller.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Vlad Yasevich <vyasevic@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Andreas Färber <afaerber@suse.de>
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 96e35046e4a97df5b4e1e24e217eb1e1701c7c71)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/net/virtio-net.c | 8 ++++----
|
|
|
9ae3a8 |
1 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/net/virtio-net.c | 8 ++++----
|
|
|
9ae3a8 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
|
9ae3a8 |
index 3bc1eed..915aa70 100644
|
|
|
9ae3a8 |
--- a/hw/net/virtio-net.c
|
|
|
9ae3a8 |
+++ b/hw/net/virtio-net.c
|
|
|
9ae3a8 |
@@ -200,16 +200,16 @@ static void rxfilter_notify(NetClientState *nc)
|
|
|
9ae3a8 |
VirtIONet *n = qemu_get_nic_opaque(nc);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
if (nc->rxfilter_notify_enabled) {
|
|
|
9ae3a8 |
+ gchar *path = object_get_canonical_path(OBJECT(n->qdev));
|
|
|
9ae3a8 |
if (n->netclient_name) {
|
|
|
9ae3a8 |
event_data = qobject_from_jsonf("{ 'name': %s, 'path': %s }",
|
|
|
9ae3a8 |
- n->netclient_name,
|
|
|
9ae3a8 |
- object_get_canonical_path(OBJECT(n->qdev)));
|
|
|
9ae3a8 |
+ n->netclient_name, path);
|
|
|
9ae3a8 |
} else {
|
|
|
9ae3a8 |
- event_data = qobject_from_jsonf("{ 'path': %s }",
|
|
|
9ae3a8 |
- object_get_canonical_path(OBJECT(n->qdev)));
|
|
|
9ae3a8 |
+ event_data = qobject_from_jsonf("{ 'path': %s }", path);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
monitor_protocol_event(QEVENT_NIC_RX_FILTER_CHANGED, event_data);
|
|
|
9ae3a8 |
qobject_decref(event_data);
|
|
|
9ae3a8 |
+ g_free(path);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* disable event notification to avoid events flooding */
|
|
|
9ae3a8 |
nc->rxfilter_notify_enabled = 0;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|