bgpd: fix null pointer dereferences

They were introduced during recent ecommunity rework in b53e67a3.

CID 1511347 and 1511348.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/bgpd/bgp_attr_evpn.c b/bgpd/bgp_attr_evpn.c
index 09b71e5d649a331a39091a87f7955ed178f6b79e..e528fadedd341140a917defc11474ba0afdc4a05 100644 (file)
--- a/bgpd/bgp_attr_evpn.c
+++ b/bgpd/bgp_attr_evpn.c
@@ -53,8 +53,10 @@ void bgp_add_routermac_ecom(struct attr *attr, struct ethaddr *routermac)
        routermac_ecom.val[0] = ECOMMUNITY_ENCODE_EVPN;
        routermac_ecom.val[1] = ECOMMUNITY_EVPN_SUBTYPE_ROUTERMAC;
        memcpy(&routermac_ecom.val[2], routermac->octet, ETH_ALEN);
-       if (!ecomm)
+       if (!ecomm) {
                bgp_attr_set_ecommunity(attr, ecommunity_new());
+               ecomm = bgp_attr_get_ecommunity(attr);
+       }
        ecommunity_add_val(ecomm, &routermac_ecom, false, false);
        ecommunity_str(ecomm);
 }

diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index 6c08168cf670c358b231aba9efa9a491a3faa673..174fadc23e04bc8737b73226db481e6ebdd37ef0 100644 (file)
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -467,7 +467,7 @@ void rfapiPrintAttrPtrs(void *stream, struct attr *attr)
        struct transit *transit;
        struct cluster_list *cluster;
        char buf[BUFSIZ];
-       struct ecommunity *ecomm = bgp_attr_get_ecommunity(attr);
+       struct ecommunity *ecomm;
 
        if (rfapiStream2Vty(stream, &fp, &vty, &out, &vty_newline) == 0)
                return;
@@ -485,6 +485,7 @@ void rfapiPrintAttrPtrs(void *stream, struct attr *attr)
        fp(out, "  community=%p, refcnt=%d%s", attr->community,
           (attr->community ? attr->community->refcnt : 0), HVTYNL);
 
+       ecomm = bgp_attr_get_ecommunity(attr);
        fp(out, "  ecommunity=%p, refcnt=%d%s", ecomm,
           (ecomm ? ecomm->refcnt : 0), HVTYNL);