proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-03 20:27:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8585 from stipmonster/asan-fixes-ospf-te

Browse Source 
ospfd: Fixed some ASAN errors
This commit is contained in:
Olivier Dugeon 2021-04-30 11:34:32 +02:00 committed by GitHub
commit 4c7ce7bd28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ospfd/ospf_te.c
View File

@ -2153,6 +2153,13 @@ static int ospf_te_parse_te(struct ls_ted *ted, struct ospf_lsa *lsa)
/* Initialize TLV browsing */
tlvh = TLV_HDR_TOP(lsa->data);
uint32_t total_len = TLV_BODY_SIZE(lsa->data) - OSPF_LSA_HEADER_SIZE;
/* If TE Router-ID is only TLV we are done */
if (ntohs(tlvh->type) == TE_TLV_ROUTER_ADDR
&& total_len == sizeof(struct te_tlv_router_addr))
return 0;
/* Skip TE Router-ID if present */
if (ntohs(tlvh->type) == TE_TLV_ROUTER_ADDR)
tlvh = TLV_HDR_NEXT(tlvh);
@ -2756,7 +2763,7 @@ static int ospf_te_parse_ext_link(struct ls_ted *ted, struct ospf_lsa *lsa)
&lsa->data->id, &edge->attributes->standard.local);
/* Initialize TLV browsing */
len = TLV_BODY_SIZE(&ext->header);
len = TLV_BODY_SIZE(&ext->header) - EXT_TLV_LINK_SIZE;
tlvh = (struct tlv_header *)((char *)(ext) + TLV_HDR_SIZE
+ EXT_TLV_LINK_SIZE);
for (; sum < len; tlvh = TLV_HDR_NEXT(tlvh)) {