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

Fix for invalid check of SPARSE_VEC_INVALID_INDEX

Browse Source 
When looking up a UDP port / GRE protocol in the sparse vectors
next_by_dst_port / next_by_protocol a data from the vector was
tested for SPARSE_VEC_INVALID_INDEX instead of sparse index itself.

This doesn’t matter for most cases since V[0] = 0 is true for all
sparse vectors. This however could cause an issue when a valid
sparse entry e.g. V[1234] = 0, with data (0) mistakenly passing
the test for SPARSE_VEC_INVALID_INDEX, while the index itself (1234)
is a valid index.

Change-Id: I04818cc43efeae047a4dae79078157d48b8c359c
Signed-off-by: Alex Popovsky <apopovsk@cisco.com>
This commit is contained in:
Alex Popovsky
2016-09-01 20:57:45 -07:00
committed by John Lo
parent ee4743adf5
commit 52901246e0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vnet/vnet/gre/node.c
View File

@ -145,8 +145,8 @@ gre_input (vlib_main_t * vm,
next0 = vec_elt(rt->next_by_protocol, i0);
next1 = vec_elt(rt->next_by_protocol, i1);
b0->error = node->errors[next0 == SPARSE_VEC_INVALID_INDEX ? GRE_ERROR_UNKNOWN_PROTOCOL : GRE_ERROR_NONE];
b1->error = node->errors[next1 == SPARSE_VEC_INVALID_INDEX ? GRE_ERROR_UNKNOWN_PROTOCOL : GRE_ERROR_NONE];
b0->error = node->errors[i0 == SPARSE_VEC_INVALID_INDEX ? GRE_ERROR_UNKNOWN_PROTOCOL : GRE_ERROR_NONE];
b1->error = node->errors[i1 == SPARSE_VEC_INVALID_INDEX ? GRE_ERROR_UNKNOWN_PROTOCOL : GRE_ERROR_NONE];
version0 = clib_net_to_host_u16 (h0->flags_and_version);
verr0 = version0 & GRE_VERSION_MASK;
@ -317,7 +317,7 @@ drop1:
next0 = vec_elt(rt->next_by_protocol, i0);
b0->error =
node->errors[next0 == SPARSE_VEC_INVALID_INDEX
node->errors[i0 == SPARSE_VEC_INVALID_INDEX
? GRE_ERROR_UNKNOWN_PROTOCOL : GRE_ERROR_NONE];
version0 = clib_net_to_host_u16 (h0->flags_and_version);

6
vnet/vnet/ip/udp_local.c
View File

@ -179,7 +179,7 @@ udp46_input_inline (vlib_main_t * vm,
next0 = (error0 == 0) ? vec_elt(rt->next_by_dst_port, i0) : next0;
next1 = (error1 == 0) ? vec_elt(rt->next_by_dst_port, i1) : next1;
if (PREDICT_FALSE(next0 == SPARSE_VEC_INVALID_INDEX))
if (PREDICT_FALSE(i0 == SPARSE_VEC_INVALID_INDEX))
{
// move the pointer back so icmp-error can find the
// ip packet header
@ -206,7 +206,7 @@ udp46_input_inline (vlib_main_t * vm,
vlib_buffer_advance (b0, sizeof (*h0));
}
if (PREDICT_FALSE(next1 == SPARSE_VEC_INVALID_INDEX))
if (PREDICT_FALSE(i1 == SPARSE_VEC_INVALID_INDEX))
{
// move the pointer back so icmp-error can find the
// ip packet header
@ -303,7 +303,7 @@ udp46_input_inline (vlib_main_t * vm,
i0 = sparse_vec_index (rt->next_by_dst_port, h0->dst_port);
next0 = vec_elt(rt->next_by_dst_port, i0);
if (PREDICT_FALSE(next0 == SPARSE_VEC_INVALID_INDEX))
if (PREDICT_FALSE(i0 == SPARSE_VEC_INVALID_INDEX))
{
// move the pointer back so icmp-error can find the
// ip packet header