diff options
| author | paul <paul> | 2003-05-14 18:29:13 +0000 |
|---|---|---|
| committer | paul <paul> | 2003-05-14 18:29:13 +0000 |
| commit | a0f6acd8a49906399e2ac73fde6406da552b2443 (patch) | |
| tree | e89a2bd710f70fe860bfe8f7963b880fec65a0c3 | |
| parent | 843521964f801b1266e59df3b005b1b4bf48fdc7 (diff) | |
From: Gilad Arnold <gilad arnold at terayon com>
Subject: [zebra 19080] suspected memory leakage upon static route deletion
upon deletion of a static route entry, at the end of
zebra/zebra_rib.c/static_delete_ipv4(), there's a call to XFREE to
deallocate the 'struct static_ipv4'. However, in the case of a static with
ifname as nexthop (type==STATIC_IPV4_IFNAME), this struct holds a pointer to
a dynamically allocated ifname string buffer (si->gate.ifname, see its
allocation within static_add_ipv4() using XSTRDUP). IMO, the attached patch
is required.
Notes: the same applies to IPv6 statics as well (fix included in patch);
and, I admit I haven't yet tested that, but it seems simple enough to be
working... ;->
| -rw-r--r-- | zebra/zebra_rib.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 0f7ccebc..f3b9fd65 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -1554,6 +1554,8 @@ static_delete_ipv4 (struct prefix *p, struct in_addr *gate, char *ifname, si->next->prev = si->prev; /* Free static route configuration. */ + if (ifname) + XFREE (0, si->gate.ifname); XFREE (MTYPE_STATIC_IPV4, si); return 1; @@ -2078,6 +2080,8 @@ static_delete_ipv6 (struct prefix *p, u_char type, struct in6_addr *gate, si->next->prev = si->prev; /* Free static route configuration. */ + if (ifname) + XFREE (0, si->ifname); XFREE (MTYPE_STATIC_IPV6, si); return 1; |