From: David Lamparter <equinox@opensourcerouting.org>
Date: Tue, 3 Jun 2014 23:00:51 +0000 (+0200)
Subject: bgpd: fix memory leak on malformed attribute
X-Git-Tag: frr-2.0-rc1~1574^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f80f838b2f54738937ef1281b237710132195c44;p=matthieu%2Ffrr.git

bgpd: fix memory leak on malformed attribute

When bgp_attr_parse returns BGP_ATTR_PARSE_ERROR, it may already have
parsed and allocated some attributes before hitting that error.  Free
the attr's data before returning.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 80651f155a..65c6cac16a 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -1720,7 +1720,10 @@ bgp_update_receive (struct peer *peer, bgp_size_t size)
       attr_parse_ret = bgp_attr_parse (peer, &attr, attribute_len, 
 			    &mp_update, &mp_withdraw);
       if (attr_parse_ret == BGP_ATTR_PARSE_ERROR)
-	return -1;
+	{
+	  bgp_attr_unintern_sub (&attr);
+	  return -1;
+	}
     }
   
   /* Logging the attribute. */