ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-cp: handle AF_BRIDGE neighbors

Browse Source 
Type: improvement

VPP crashes when a linux-cp tap is added to a bridge on the host system
because rtnl_neigh_get_dst() returns NULL for the neighbor message that
is sent by the kernel.

Check for NULL before trying to use the address from a neighbor in a
netlink message.

Signed-off-by: Matthew Smith <mgsmith@netgate.com>
Change-Id: I8a683d815a09620df9c0cc76e18df39828428e2c
Signed-off-by: Matthew Smith <mgsmith@netgate.com>
This commit is contained in:
Matthew Smith
2022-08-19 19:54:40 +00:00
committed by Neale Ranns
parent 1a1c59d1a2
commit 9cd37fb28c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/linux-cp/lcp_router.c
View File

@@ -710,8 +710,11 @@ lcp_router_neigh_del (struct rtnl_neigh *rn)
{
ip_address_t nh;
int rv;
struct nl_addr *rna;
lcp_router_mk_addr (rtnl_neigh_get_dst (rn), &nh);
if ((rna = rtnl_neigh_get_dst (rn)) == NULL)
return;
lcp_router_mk_addr (rna, &nh);
if (ip46_address_is_multicast (&ip_addr_46 (&nh)))
{
@@ -759,8 +762,11 @@ lcp_router_neigh_add (struct rtnl_neigh *rn)
struct nl_addr *ll;
ip_address_t nh;
int state;
struct nl_addr *rna;
lcp_router_mk_addr (rtnl_neigh_get_dst (rn), &nh);
if ((rna = rtnl_neigh_get_dst (rn)) == NULL)
return;
lcp_router_mk_addr (rna, &nh);
if (ip46_address_is_multicast (&ip_addr_46 (&nh)))
{