From: G. Paul Ziemba <paulz@labn.net>
Date: Thu, 22 Mar 2018 01:20:39 +0000 (-0700)
Subject: bgpd: fix crash unleaking RFP routes
X-Git-Tag: frr-5.0-dev~127^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1b3510a0603deefae2287b63f278b11f4fddf141;p=matthieu%2Ffrr.git

bgpd: fix crash unleaking RFP routes

Signed-off-by: G. Paul Ziemba <paulz@labn.net>
---

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 7e4b896598..00878e1f46 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -953,8 +953,8 @@ void vpn_leak_to_vrf_update(struct bgp *bgp_vpn,       /* from */
 void vpn_leak_to_vrf_withdraw(struct bgp *bgp_vpn,       /* from */
 			      struct bgp_info *info_vpn) /* route */
 {
-	struct prefix *p = &info_vpn->net->p;
-	afi_t afi = family2afi(p->family);
+	struct prefix *p;
+	afi_t afi;
 	safi_t safi = SAFI_UNICAST;
 	struct bgp *bgp;
 	struct listnode *mnode, *mnnode;
@@ -967,6 +967,21 @@ void vpn_leak_to_vrf_withdraw(struct bgp *bgp_vpn,       /* from */
 	if (debug)
 		zlog_debug("%s: start (info_vpn=%p)", __func__, info_vpn);
 
+	if (!info_vpn->net) {
+		/* BGP_ROUTE_RFP routes do not have info_vpn->net set (yet) */
+		if (info_vpn->type == ZEBRA_ROUTE_BGP &&
+			info_vpn->sub_type == BGP_ROUTE_RFP) {
+
+			return;
+		}
+		if (debug)
+			zlog_debug("%s: info_vpn->net unexpectedly NULL, no prefix, bailing",
+				__func__);
+		return;
+	}
+
+	p = &info_vpn->net->p;
+	afi = family2afi(p->family);
 
 	/* Loop over VRFs */
 	for (ALL_LIST_ELEMENTS(bm->bgp, mnode, mnnode, bgp)) {