From 60a95e524203f70cf49973d6d2fb09807ccb6bb9 Mon Sep 17 00:00:00 2001 From: Chen Hanxiao Date: Sun, 11 Feb 2018 11:07:10 +0800 Subject: [PATCH] qemu: don't leak in qemuGetDHCPInterfaces when failing to alloc We forgot to free alloced mem when failed to dup ifname or macaddr. Also use VIR_STEAL_PTR to simplify codes. Signed-off-by: Chen Hanxiao Signed-off-by: Michal Privoznik --- src/qemu/qemu_agent.c | 3 +-- src/qemu/qemu_driver.c | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5d125c4138..0f36054a61 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2190,8 +2190,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, iface->naddrs = addrs_count; } - *ifaces = ifaces_ret; - ifaces_ret = NULL; + VIR_STEAL_PTR(*ifaces, ifaces_ret); ret = ifaces_count; cleanup: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 978ecd4e07..bbce5bd81b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20569,10 +20569,10 @@ qemuGetDHCPInterfaces(virDomainPtr dom, goto error; if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) - goto cleanup; + goto error; if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) - goto cleanup; + goto error; } for (j = 0; j < n_leases; j++) { @@ -20580,7 +20580,7 @@ qemuGetDHCPInterfaces(virDomainPtr dom, virDomainIPAddressPtr ip_addr = &iface->addrs[j]; if (VIR_STRDUP(ip_addr->addr, lease->ipaddr) < 0) - goto cleanup; + goto error; ip_addr->type = lease->type; ip_addr->prefix = lease->prefix; @@ -20592,8 +20592,7 @@ qemuGetDHCPInterfaces(virDomainPtr dom, VIR_FREE(leases); } - *ifaces = ifaces_ret; - ifaces_ret = NULL; + VIR_STEAL_PTR(*ifaces, ifaces_ret); rv = ifaces_count; cleanup: -- GitLab