diff mbox

[ovs-dev,6/8] pinctrl: Fix memory leak in consider_nat_address()

Message ID 1491601426-77274-6-git-send-email-yihung.wei@gmail.com
State Superseded
Headers show

Commit Message

Yi-Hung Wei April 7, 2017, 9:43 p.m. UTC 
In testcase "ovn -- send gratuitous arp for NAT rules on distributed router",
valgrind reports memory leaks as following.
    xrealloc (util.c:123)
    add_ipv4_netaddr.isra.0 (ovn-util.c:28)
    extract_addresses (ovn-util.c:128)
    extract_addresses_with_port.constprop.17 (pinctrl.c:1257)
    consider_nat_address.isra.15 (pinctrl.c:1318)
    get_nat_addresses_and_keys (pinctrl.c:1361)
    send_garp_run (pinctrl.c:1402)
    pinctrl_run (pinctrl.c:796)
    main (ovn-controller.c:619)

Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
---
 ovn/controller/pinctrl.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox

Patch

diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c
index 9b408ea6c253..8063e6487b2a 100644
--- a/ovn/controller/pinctrl.c
+++ b/ovn/controller/pinctrl.c
@@ -1317,6 +1317,7 @@  consider_nat_address(const char *nat_address,
     char *lport = NULL;
     if (!extract_addresses_with_port(nat_address, laddrs, &lport)
         || (!lport && !strcmp(pb->type, "patch"))) {
+        destroy_lport_addresses(laddrs);
         free(laddrs);
         if (lport) {
             free(lport);
@@ -1324,6 +1325,7 @@  consider_nat_address(const char *nat_address,
         return;
     } else if (lport) {
         if (!pinctrl_is_chassis_resident(lports, chassis, lport)) {
+            destroy_lport_addresses(laddrs);
             free(laddrs);
             free(lport);
             return;