zebra: The dplane_fpm_nl return path leaks memory

The route entry created when using a ctx to pass route
entry data backup to the master pthread in zebra is
being leaked.  Prevent this from happening.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 7f9c5c7fa2d927033549a806fd9025a9459f22bc)

diff --git a/zebra/rib.h b/zebra/rib.h
index a02a461e8927a076bdf703f5de043a2263eb34b6..2e62148ea08ad5c4b46600f0d07447263c764947 100644 (file)
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -352,6 +352,8 @@ extern void _route_entry_dump(const char *func, union prefixconstptr pp,
                              union prefixconstptr src_pp,
                              const struct route_entry *re);
 
+void zebra_rib_route_entry_free(struct route_entry *re);
+
 struct route_entry *
 zebra_rib_route_entry_new(vrf_id_t vrf_id, int type, uint8_t instance,
                          uint32_t flags, uint32_t nhe_id, uint32_t table_id,

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 5d236291433694984b7b05fc201199dda7958efd..ce839cafee5fa1320bf3407786c561ae92b90809 100644 (file)
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -992,6 +992,8 @@ int netlink_route_change_read_unicast_internal(struct nlmsghdr *h,
                                                 re, ng, startup, ctx);
                        if (ng)
                                nexthop_group_delete(&ng);
+                       if (ctx)
+                               zebra_rib_route_entry_free(re);
                } else {
                        /*
                         * I really don't see how this is possible

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 2c3bb28d6c2eefc8adbe16667fd81f0f1b759bb8..67d4e4c35b42ed76b396b05dfa099b080e9e6168 100644 (file)
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -4159,6 +4159,12 @@ struct route_entry *zebra_rib_route_entry_new(vrf_id_t vrf_id, int type,
 
        return re;
 }
+
+void zebra_rib_route_entry_free(struct route_entry *re)
+{
+       XFREE(MTYPE_RE, re);
+}
+
 /*
  * Internal route-add implementation; there are a couple of different public
  * signatures. Callers in this path are responsible for the memory they