From: Jorge Boncompte [DTI2] <jorge@dti2.net>
Date: Mon, 7 May 2012 16:53:02 +0000 (+0000)
Subject: bgpd: fix struct attr_extra leak in bgp_default_originate()
X-Git-Tag: frr-2.0-rc1~1815
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6182d65b23fc0362b173e2a9314fa4551523a1c2;p=mirror%2Ffrr.git

bgpd: fix struct attr_extra leak in bgp_default_originate()

  The call to bgp_attr_default_set() above creates the attr_extra struct,
but the attr.extra = NULL initialization was leaking it.

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 68eae6a03b..a421fd7cea 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2488,12 +2488,8 @@ bgp_default_originate (struct peer *peer, afi_t afi, safi_t safi, int withdraw)
 #ifdef HAVE_IPV6
   else if (afi == AFI_IP6)
     {
-      struct attr_extra *ae;
-      attr.extra = NULL;
-      
-      ae = bgp_attr_extra_get (&attr);
-      attr.extra = ae;
-      
+      struct attr_extra *ae = attr.extra;
+
       str2prefix ("::/0", &p);
 
       /* IPv6 global nexthop must be included. */