From: Donatas Abraitis <donatas.abraitis@gmail.com>
Date: Mon, 16 Nov 2020 16:05:53 +0000 (+0200)
Subject: bgpd: Make sure path->attr is not NULL before dereferencing
X-Git-Tag: base_7.6~275^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7de5a4d9e0035d78f7a646289397cb8a10f75728;p=mirror%2Ffrr.git

bgpd: Make sure path->attr is not NULL before dereferencing

Null-checking "path->attr" suggests that it may be null, but it has
already been dereferenced on all paths leading to the check.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
---

diff --git a/bgpd/bgp_flowspec_vty.c b/bgpd/bgp_flowspec_vty.c
index 0789581df1..57f212b05d 100644
--- a/bgpd/bgp_flowspec_vty.c
+++ b/bgpd/bgp_flowspec_vty.c
@@ -268,7 +268,7 @@ void route_vty_out_flowspec(struct vty *vty, const struct prefix *p,
 	json_object *json_ecom_path = NULL;
 	json_object *json_time_path = NULL;
 	char timebuf[BGP_UPTIME_LEN];
-	struct ecommunity *ipv6_ecomm;
+	struct ecommunity *ipv6_ecomm = NULL;
 
 	if (p == NULL || p->family != AF_FLOWSPEC)
 		return;
@@ -300,7 +300,9 @@ void route_vty_out_flowspec(struct vty *vty, const struct prefix *p,
 	if (!path)
 		return;
 
-	ipv6_ecomm = bgp_attr_get_ipv6_ecommunity(path->attr);
+	if (path->attr)
+		ipv6_ecomm = bgp_attr_get_ipv6_ecommunity(path->attr);
+
 	if (path->attr && (path->attr->ecommunity || ipv6_ecomm)) {
 		/* Print attribute */
 		attr = path->attr;