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

interface: Prevent bad inner-dot1q any exact-match configuration

Browse Source 
Someone much more knowledgeable than I wrote:

    For L3 IP forwarding, any VLAN tags on a packet must be exact
    match to a sub-interface which means both outer and inner VLAN
    tag IDs must be exact-matched to specific values defined of that
    sub-interface.  Without exact match on a L3 sub-interface, VPP
    has no mechanism to know what VLAN tags to use for packet output,
    such as ARP request packets or IP packets, on that sub-interface.

    Thus, sub-interface with "inner-dot1q any" is not an exact match
    sub-interface by definition since no match is present on inner
    tag.

While in the area, fix a memory leak that would ensue on poorly
configured interfaces.

Change-Id: I8d17a96dbca3e3724c297ecc935ca61764e6ce2e
Type: fix
Signed-off-by: Jon Loeliger <jdl@netgate.com>
(cherry picked from commit b22e1f06bbebc48ec72ce8effa529e69ffbb12ca)
This commit is contained in:
Jon Loeliger
2019-12-19 09:03:52 -06:00
committed by Dave Wallace
parent 74331c935f
commit 62c6e93d10
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vnet/interface.c
View File

@ -582,6 +582,16 @@ vnet_create_sw_interface (vnet_main_t * vnm, vnet_sw_interface_t * template,
vnet_hw_interface_t *hi; vnet_hw_interface_t *hi;
vnet_device_class_t *dev_class; vnet_device_class_t *dev_class;
if (template->sub.eth.flags.two_tags == 1
&& template->sub.eth.flags.exact_match == 1
&& (template->sub.eth.flags.inner_vlan_id_any == 1
|| template->sub.eth.flags.outer_vlan_id_any == 1))
{
error = clib_error_return (0,
"inner-dot1q any exact-match is unsupported");
return error;
}
hi = vnet_get_sup_hw_interface (vnm, template->sup_sw_if_index); hi = vnet_get_sup_hw_interface (vnm, template->sup_sw_if_index);
dev_class = vnet_get_device_class (vnm, hi->dev_class_index); dev_class = vnet_get_device_class (vnm, hi->dev_class_index);

6
src/vnet/interface_cli.c
View File

@ -757,9 +757,6 @@ create_sub_interfaces (vlib_main_t * vm,
continue; continue;
} }
kp = clib_mem_alloc (sizeof (*kp));
*kp = sup_and_sub_key;
template.type = VNET_SW_INTERFACE_TYPE_SUB; template.type = VNET_SW_INTERFACE_TYPE_SUB;
template.flood_class = VNET_FLOOD_CLASS_NORMAL; template.flood_class = VNET_FLOOD_CLASS_NORMAL;
template.sup_sw_if_index = hi->sw_if_index; template.sup_sw_if_index = hi->sw_if_index;
@ -771,6 +768,9 @@ create_sub_interfaces (vlib_main_t * vm,
if (error) if (error)
goto done; goto done;
kp = clib_mem_alloc (sizeof (*kp));
*kp = sup_and_sub_key;
hash_set (hi->sub_interface_sw_if_index_by_id, id, sw_if_index); hash_set (hi->sub_interface_sw_if_index_by_id, id, sw_if_index);
hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index); hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index);
vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name,