Merge pull request #13058 from opensourcerouting/fix/bgp_null_deref_8.5

bgpd: Prevent Null pointer deref when outputting data
This commit is contained in:
Donald Sharp 2023-03-20 19:51:15 -04:00 committed by GitHub
commit 64de7b5820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2574,7 +2574,8 @@ static void bgp_evpn_es_show_entry(struct vty *vty,
bgp_evpn_es_vteps_str(vtep_str, es, sizeof(vtep_str));
vty_out(vty, "%-30s %-5s %-21pRD %-8d %s\n", es->esi_str,
type_str, &es->es_base_frag->prd,
type_str,
es->es_base_frag ? &es->es_base_frag->prd : NULL,
listcount(es->es_evi_list), vtep_str);
}
}
@ -2650,7 +2651,8 @@ static void bgp_evpn_es_show_entry_detail(struct vty *vty,
vty_out(vty, "ESI: %s\n", es->esi_str);
vty_out(vty, " Type: %s\n", type_str);
vty_out(vty, " RD: %pRD\n", &es->es_base_frag->prd);
vty_out(vty, " RD: %pRD\n",
es->es_base_frag ? &es->es_base_frag->prd : NULL);
vty_out(vty, " Originator-IP: %pI4\n", &es->originator_ip);
if (es->flags & BGP_EVPNES_LOCAL)
vty_out(vty, " Local ES DF preference: %u\n",