proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-25 22:30:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14422 from cscarpitta/bugfix/fix-coverity-isis-srv6

Browse Source 
isisd: Fix a bunch of coverity issues in IS-IS
This commit is contained in:
Donatas Abraitis 2023-09-19 14:43:22 +03:00 committed by GitHub
commit 1f5809e44f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
isisd/isis_tlvs.c
View File

@ -2751,7 +2751,7 @@ static int unpack_item_srv6_end_sid(uint16_t mtid, uint8_t len,
void *dest, int indent) void *dest, int indent)
{ {
struct isis_subtlvs *subtlvs = dest; struct isis_subtlvs *subtlvs = dest;
struct isis_srv6_end_sid_subtlv *sid; struct isis_srv6_end_sid_subtlv *sid = NULL;
size_t consume; size_t consume;
uint8_t subsubtlv_len; uint8_t subsubtlv_len;
@ -2763,7 +2763,7 @@ static int unpack_item_srv6_end_sid(uint16_t mtid, uint8_t len,
log, indent, log, indent,
"Not enough data left. (expected 19 or more bytes, got %hhu)\n", "Not enough data left. (expected 19 or more bytes, got %hhu)\n",
len); len);
return 1; goto out;
} }
sid = XCALLOC(MTYPE_ISIS_SUBTLV, sizeof(*sid)); sid = XCALLOC(MTYPE_ISIS_SUBTLV, sizeof(*sid));

17
isisd/isis_zebra.c
View File

@ -1017,12 +1017,15 @@ void isis_zebra_srv6_adj_sid_install(struct srv6_adjacency *sra)
struct seg6local_context ctx = {}; struct seg6local_context ctx = {};
uint16_t prefixlen = IPV6_MAX_BITLEN; uint16_t prefixlen = IPV6_MAX_BITLEN;
struct interface *ifp; struct interface *ifp;
struct isis_circuit *circuit = sra->adj->circuit; struct isis_circuit *circuit;
struct isis_area *area = circuit->area; struct isis_area *area;
if (!sra) if (!sra)
return; return;
circuit = sra->adj->circuit;
area = circuit->area;
sr_debug("ISIS-SRv6 (%s): setting adjacency SID %pI6", area->area_tag, sr_debug("ISIS-SRv6 (%s): setting adjacency SID %pI6", area->area_tag,
&sra->sid); &sra->sid);
@ -1071,12 +1074,15 @@ void isis_zebra_srv6_adj_sid_uninstall(struct srv6_adjacency *sra)
enum seg6local_action_t action = ZEBRA_SEG6_LOCAL_ACTION_UNSPEC; enum seg6local_action_t action = ZEBRA_SEG6_LOCAL_ACTION_UNSPEC;
struct interface *ifp; struct interface *ifp;
uint16_t prefixlen = IPV6_MAX_BITLEN; uint16_t prefixlen = IPV6_MAX_BITLEN;
struct isis_circuit *circuit = sra->adj->circuit; struct isis_circuit *circuit;
struct isis_area *area = circuit->area; struct isis_area *area;
if (!sra) if (!sra)
return; return;
circuit = sra->adj->circuit;
area = circuit->area;
switch (sra->behavior) { switch (sra->behavior) {
case SRV6_ENDPOINT_BEHAVIOR_END_X: case SRV6_ENDPOINT_BEHAVIOR_END_X:
prefixlen = IPV6_MAX_BITLEN; prefixlen = IPV6_MAX_BITLEN;
@ -1130,6 +1136,9 @@ static int isis_zebra_process_srv6_locator_chunk(ZAPI_CALLBACK_ARGS)
enum srv6_endpoint_behavior_codepoint behavior; enum srv6_endpoint_behavior_codepoint behavior;
bool allocated = false; bool allocated = false;
if (!isis)
return -1;
/* Decode the received zebra message */ /* Decode the received zebra message */
s = zclient->ibuf; s = zclient->ibuf;
if (zapi_srv6_locator_chunk_decode(s, chunk) < 0) if (zapi_srv6_locator_chunk_decode(s, chunk) < 0)