From: Denis Ovsienko <infrastation@yandex.ru>
Date: Sat, 22 Oct 2011 18:32:26 +0000 (+0400)
Subject: bgpd: check AGGREGATOR attr flags (BZ#678)
X-Git-Tag: frr-2.0-rc1~1999
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b4cd2421518be7e18046e974e25b9bf4cf769bd2;p=mirror%2Ffrr.git

bgpd: check AGGREGATOR attr flags (BZ#678)

* bgp_attr.c
  * bgp_attr_aggregator(): check Optional/Transitive flag bits
---

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index d7eeec1f24..75b7c7976d 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -1160,6 +1160,23 @@ bgp_attr_aggregator (struct peer *peer, bgp_size_t length,
   bgp_size_t total;
   
   total = length + (CHECK_FLAG (flag, BGP_ATTR_FLAG_EXTLEN) ? 4 : 3);
+  /* Flags check. */
+  if (! CHECK_FLAG (flag, BGP_ATTR_FLAG_OPTIONAL))
+  {
+    zlog (peer->log, LOG_ERR,
+          "AGGREGATOR attribute must be flagged as \"optional\" (%u)", flag);
+    return bgp_attr_malformed (peer, BGP_ATTR_AGGREGATOR, flag,
+                               BGP_NOTIFY_UPDATE_ATTR_FLAG_ERR,
+                               startp, total);
+  }
+  if (! CHECK_FLAG (flag, BGP_ATTR_FLAG_TRANS))
+  {
+    zlog (peer->log, LOG_ERR,
+          "AGGREGATOR attribute must be flagged as \"transitive\" (%u)", flag);
+    return bgp_attr_malformed (peer, BGP_ATTR_AGGREGATOR, flag,
+                               BGP_NOTIFY_UPDATE_ATTR_FLAG_ERR,
+                               startp, total);
+  }
   /* peer with AS4 will send 4 Byte AS, peer without will send 2 Byte */
   if (CHECK_FLAG (peer->cap, PEER_CAP_AS4_RCV))
     wantedlen = 8;