OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net: Fix memory leak in net_param_nic()

Browse Source 
The early exits in case of errors leak the memory allocated for nd_id.
Fix it by using a "goto out" to the cleanup at the end of the function
instead.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Thomas Huth 2018-04-30 09:26:45 +02:00 committed by Jason Wang
parent c74e62ee3e
commit 9d94619189
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/net.c
View File

@ -1502,11 +1502,12 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
g_free(mac); g_free(mac);
if (ret) { if (ret) {
error_setg(errp, "invalid syntax for ethernet address"); error_setg(errp, "invalid syntax for ethernet address");
return -1; goto out;
} }
if (is_multicast_ether_addr(ni->macaddr.a)) { if (is_multicast_ether_addr(ni->macaddr.a)) {
error_setg(errp, "NIC cannot have multicast MAC address"); error_setg(errp, "NIC cannot have multicast MAC address");
return -1; ret = -1;
goto out;
} }
} }
qemu_macaddr_default_if_unset(&ni->macaddr); qemu_macaddr_default_if_unset(&ni->macaddr);
@ -1518,6 +1519,7 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
nb_nics++; nb_nics++;
} }
out:
g_free(nd_id); g_free(nd_id);
return ret; return ret;
} }