From: Lou Berger <lberger@labn.net>
Date: Tue, 27 Sep 2016 11:54:56 +0000 (-0400)
Subject: bgpd: remove old/duplicate, and now out of order prefixlen test
X-Git-Tag: frr-2.0-rc1~202
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e55281983efaa904d40ce903996b30d20f74eb52;p=matthieu%2Ffrr.git

bgpd: remove old/duplicate, and now out of order prefixlen test
---

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 91f0e91b39..36ba65af1a 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -146,17 +146,17 @@ bgp_nlri_parse_vpn (struct peer *peer, struct attr *attr,
           pnt += BGP_ADDPATH_ID_LEN;
         }
 
+      /* Fetch prefix length. */
+      prefixlen = *pnt++;
+      p.family = afi2family (packet->afi);
+      psize = PSIZE (prefixlen);
+
       if (prefixlen < 88)
 	{
 	  zlog_err ("prefix length is less than 88: %d", prefixlen);
 	  return -1;
 	}
 
-      /* Fetch prefix length. */
-      prefixlen = *pnt++;
-      p.family = afi2family (packet->afi);
-      psize = PSIZE (prefixlen);
-      
       /* sanity check against packet data */
       if (prefixlen < VPN_PREFIXLEN_MIN_BYTES*8 || (pnt + psize) > lim)
         {