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

Merge pull request #10463 from idryzhov/bgp-memcmp

Browse Source 
[8.2] bgpd: Fixing memcmp to avoid coverity issue
This commit is contained in:
Jafar Al-Gharaibeh 2022-02-02 12:38:54 -06:00 committed by GitHub
commit 718c28c263
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/bgp_attr.c
View File

@ -404,9 +404,8 @@ static bool overlay_index_same(const struct attr *a1, const struct attr *a2)
if (!a1 && !a2)
return true;
return !memcmp(bgp_attr_get_evpn_overlay(a1),
bgp_attr_get_evpn_overlay(a2),
sizeof(struct bgp_route_evpn));
return bgp_route_evpn_same(bgp_attr_get_evpn_overlay(a1),
bgp_attr_get_evpn_overlay(a2));
}
/* Unknown transit attribute. */

8
bgpd/bgp_attr_evpn.c
View File

@ -36,6 +36,14 @@
#include "bgpd/bgp_evpn.h"
#include "bgpd/bgp_evpn_private.h"
bool bgp_route_evpn_same(const struct bgp_route_evpn *e1,
const struct bgp_route_evpn *e2)
{
return (e1->type == e2->type &&
!memcmp(&(e1->eth_s_id), &(e2->eth_s_id), sizeof(esi_t)) &&
!ipaddr_cmp(&(e1->gw_ip), &(e2->gw_ip)));
}
void bgp_add_routermac_ecom(struct attr *attr, struct ethaddr *routermac)
{
struct ecommunity_val routermac_ecom;

3
bgpd/bgp_attr_evpn.h
View File

@ -59,4 +59,7 @@ extern void bgp_attr_evpn_na_flag(struct attr *attr, uint8_t *router_flag,
bool *proxy);
extern uint16_t bgp_attr_df_pref_from_ec(struct attr *attr, uint8_t *alg);
extern bool bgp_route_evpn_same(const struct bgp_route_evpn *e1,
const struct bgp_route_evpn *e2);
#endif /* _QUAGGA_BGP_ATTR_EVPN_H */

2
bgpd/bgp_evpn.c
View File

@ -6146,7 +6146,7 @@ static bool bgp_evpn_remote_ip_hash_cmp(const void *p1, const void *p2)
const struct evpn_remote_ip *ip1 = p1;
const struct evpn_remote_ip *ip2 = p2;
return (memcmp(&ip1->addr, &ip2->addr, sizeof(struct ipaddr)) == 0);
return !ipaddr_cmp(&ip1->addr, &ip2->addr);
}
static void bgp_evpn_remote_ip_hash_init(struct bgpevpn *vpn)