Merge pull request #15935 from FRRouting/mergify/bp/stable/10.0/pr-15921

bgpd: Fix crash when deleting the SRv6 locator (backport #15921)
This commit is contained in:
Donald Sharp 2024-05-06 10:24:02 -04:00 committed by GitHub
commit 6056a8ce40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -3187,12 +3187,12 @@ static int bgp_zebra_process_srv6_locator_add(ZAPI_CALLBACK_ARGS)
struct bgp *bgp = bgp_get_default();
const char *loc_name = bgp->srv6_locator_name;
if (zapi_srv6_locator_decode(zclient->ibuf, &loc) < 0)
return -1;
if (!bgp || !bgp->srv6_enabled)
return 0;
if (zapi_srv6_locator_decode(zclient->ibuf, &loc) < 0)
return -1;
if (bgp_zebra_srv6_manager_get_locator_chunk(loc_name) < 0)
return -1;
@ -3210,6 +3210,9 @@ static int bgp_zebra_process_srv6_locator_delete(ZAPI_CALLBACK_ARGS)
struct in6_addr *tovpn_sid;
struct prefix_ipv6 tmp_prefi;
if (!bgp)
return 0;
if (zapi_srv6_locator_decode(zclient->ibuf, &loc) < 0)
return -1;