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

fib: fix crash when create vxlan/vxlan-gpe/geneve/gtpu tunnel.

Browse Source 
Fix vpp crash when create vxlan/vxlan-gpe/geneve/gtpu tunnel
with 0.0.0.0 dst ip in debug build. The ASSERT should be move
out of fib_prefix_from_ip46_addr, which may be called when
create vxlan/vxlan-gpe/geneve/gtpu tunnel with 0.0.0.0 dst ip.

How to reproduce:
1. build debug vpp and run vpp
2. create vxlan t src 192.168.0.2 dst 0.0.0.0 vni 1 instance 1
   create vxlan-gpe tunnel local 192.168.0.2 remote 0.0.0.0 vni 1
   create geneve tunnel local 192.168.0.2 remote 0.0.0.0 vni 1
   create gtpu tunnel src 192.168.0.2 dst 0.0.0.0 teid 1

Type: fix

Change-Id: I19972f6af588f4ff7fd17de1b16b9301e43d596f
Signed-off-by: Huawei LI <lihuawei_zzu@163.com>
This commit is contained in:
Huawei LI
2022-09-29 11:28:12 +08:00
committed by Neale Ranns
parent 23b33ec02b
commit 06923b33a9
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/geneve/geneve.c
View File

@ -470,7 +470,8 @@ int vnet_geneve_add_del_tunnel
fib_prefix_t tun_remote_pfx;
vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL;
fib_prefix_from_ip46_addr (&t->remote, &tun_remote_pfx);
fib_protocol_t fp = fib_ip_proto (is_ip6);
fib_prefix_from_ip46_addr (fp, &t->remote, &tun_remote_pfx);
if (!ip46_address_is_multicast (&t->remote))
{
/* Unicast tunnel -
@ -494,8 +495,6 @@ int vnet_geneve_add_del_tunnel
* with different VNIs, create the output fib adjecency only if
* it does not already exist
*/
fib_protocol_t fp = fib_ip_proto (is_ip6);
if (vtep_addr_ref (&vxm->vtep_table,
t->encap_fib_index, &t->remote) == 1)
{

5
src/plugins/gtpu/gtpu.c
View File

@ -473,7 +473,8 @@ int vnet_gtpu_add_mod_del_tunnel
fib_prefix_t tun_dst_pfx;
vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL;
fib_prefix_from_ip46_addr (&t->dst, &tun_dst_pfx);
fib_protocol_t fp = fib_ip_proto (is_ip6);
fib_prefix_from_ip46_addr (fp, &t->dst, &tun_dst_pfx);
if (!ip46_address_is_multicast (&t->dst))
{
/* Unicast tunnel -
@ -497,8 +498,6 @@ int vnet_gtpu_add_mod_del_tunnel
* with different VNIs, create the output adjacency only if
* it does not already exist
*/
fib_protocol_t fp = fib_ip_proto (is_ip6);
if (vtep_addr_ref (&gtm->vtep_table,
t->encap_fib_index, &t->dst) == 1)
{

6
src/vnet/fib/fib_path.c
View File

@ -1998,7 +1998,11 @@ fib_path_resolve (fib_node_index_t path_index)
}
else
{
fib_prefix_from_ip46_addr(&path->recursive.fp_nh.fp_ip, &pfx);
ASSERT(!ip46_address_is_zero(&path->recursive.fp_nh.fp_ip));
fib_protocol_t fp = (ip46_address_is_ip4(&path->recursive.fp_nh.fp_ip) ?
FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
fib_prefix_from_ip46_addr(fp, &path->recursive.fp_nh.fp_ip, &pfx);
}
fib_table_lock(path->recursive.fp_tbl_id,

13
src/vnet/fib/fib_types.c
View File

@ -78,16 +78,15 @@ format_fib_mpls_label (u8 *s, va_list *ap)
}
void
fib_prefix_from_ip46_addr (const ip46_address_t *addr,
fib_prefix_from_ip46_addr (fib_protocol_t fproto,
const ip46_address_t *addr,
fib_prefix_t *pfx)
{
ASSERT(!ip46_address_is_zero(addr));
ASSERT(FIB_PROTOCOL_MPLS != fproto);
pfx->fp_proto = ((ip46_address_is_ip4(addr) ?
FIB_PROTOCOL_IP4 :
FIB_PROTOCOL_IP6));
pfx->fp_len = ((ip46_address_is_ip4(addr) ?
32 : 128));
pfx->fp_proto = fproto;
pfx->fp_len = ((FIB_PROTOCOL_IP4 == fproto) ?
32 : 128);
pfx->fp_addr = *addr;
pfx->___fp___pad = 0;
}

5
src/vnet/fib/fib_types.h
View File

@ -276,8 +276,9 @@ extern void fib_prefix_normalize(const fib_prefix_t *p,
/**
* \brief Host prefix from ip
*/
extern void fib_prefix_from_ip46_addr (const ip46_address_t *addr,
fib_prefix_t *pfx);
extern void fib_prefix_from_ip46_addr (fib_protocol_t fproto,
const ip46_address_t *addr,
fib_prefix_t *pfx);
extern u8 * format_fib_prefix(u8 * s, va_list * args);
extern u8 * format_fib_forw_chain_type(u8 * s, va_list * args);

5
src/vnet/vxlan-gpe/vxlan_gpe.c
View File

@ -594,7 +594,8 @@ int vnet_vxlan_gpe_add_del_tunnel
fib_prefix_t tun_remote_pfx;
vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL;
fib_prefix_from_ip46_addr (&t->remote, &tun_remote_pfx);
fib_protocol_t fp = fib_ip_proto (is_ip6);
fib_prefix_from_ip46_addr (fp, &t->remote, &tun_remote_pfx);
if (!ip46_address_is_multicast (&t->remote))
{
/* Unicast tunnel -
@ -618,8 +619,6 @@ int vnet_vxlan_gpe_add_del_tunnel
* with different VNIs, create the output fib adjacency only if
* it does not already exist
*/
fib_protocol_t fp = fib_ip_proto (is_ip6);
if (vtep_addr_ref (&ngm->vtep_table,
t->encap_fib_index, &t->remote) == 1)
{

5
src/vnet/vxlan/vxlan.c
View File

@ -537,7 +537,8 @@ int vnet_vxlan_add_del_tunnel
fib_prefix_t tun_dst_pfx;
vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL;
fib_prefix_from_ip46_addr (&t->dst, &tun_dst_pfx);
fib_protocol_t fp = fib_ip_proto (is_ip6);
fib_prefix_from_ip46_addr (fp, &t->dst, &tun_dst_pfx);
if (!ip46_address_is_multicast (&t->dst))
{
/* Unicast tunnel -
@ -561,8 +562,6 @@ int vnet_vxlan_add_del_tunnel
* with different VNIs, create the output fib adjacency only if
* it does not already exist
*/
fib_protocol_t fp = fib_ip_proto (is_ip6);
if (vtep_addr_ref (&vxm->vtep_table,
t->encap_fib_index, &t->dst) == 1)
{