summaryrefslogtreecommitdiff
path: root/net.c
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-09-17 16:53:39 -0400
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-05 09:32:44 -0500
commita9796703447fc5c5691b749915f0f627f47f05a9 (patch)
tree5a081b62ed2015fa99669feffa01ea4dc8bed3b6 /net.c
parente5bc201df7e060bc4c2912258a77c53f8901356c (diff)
downloadqemu-a9796703447fc5c5691b749915f0f627f47f05a9.tar.gz
qemu-a9796703447fc5c5691b749915f0f627f47f05a9.tar.bz2
qemu-a9796703447fc5c5691b749915f0f627f47f05a9.zip
Correctly free nd structure
When we "free" a NICInfo structure, we can leak pointers, since we don't do much more than setting used = 0. We free() the model parameter, but we don't set it to NULL. This means that a new user of this structure will see garbage in there. It was not noticed before because reusing a NICInfo is not that common, but it can be, for users of device pci hotplug. A user hit it, described at https://bugzilla.redhat.com/show_bug.cgi?id=524022 This patch memset's the whole structure, guaranteeing that anyone reusing it will see a fresh NICinfo. Also, we free some other strings that are currently leaking. This codebase is quite old, so this patch should feed all stable trees. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'net.c')
-rw-r--r--net.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/net.c b/net.c
index 2686f78b88..bcc517633b 100644
--- a/net.c
+++ b/net.c
@@ -2803,8 +2803,13 @@ void net_client_uninit(NICInfo *nd)
{
nd->vlan->nb_guest_devs--;
nb_nics--;
- nd->used = 0;
- free((void *)nd->model);
+
+ qemu_free((void *)nd->model);
+ qemu_free((void *)nd->name);
+ qemu_free((void *)nd->devaddr);
+ qemu_free((void *)nd->id);
+
+ memset(nd, 0, sizeof(*nd));
}
static int net_host_check_device(const char *device)