• Qingqing Yang's avatar
    flow_dissector: Do not count vlan tags inside tunnel payload · 9f87eb42
    Qingqing Yang authored
    We've met the problem that when there is a vlan tag inside
    GRE encapsulation, the match of num_of_vlans fails.
    It is caused by the vlan tag inside GRE payload has been
    counted into num_of_vlans, which is not expected.
    
    One example packet is like this:
    Ethernet II, Src: Broadcom_68:56:07 (00:10:18:68:56:07)
                       Dst: Broadcom_68:56:08 (00:10:18:68:56:08)
    802.1Q Virtual LAN, PRI: 0, DEI: 0, ID: 100
    Internet Protocol Version 4, Src: 192.168.1.4, Dst: 192.168.1.200
    Generic Routing Encapsulation (Transparent Ethernet bridging)
    Ethernet II, Src: Broadcom_68:58:07 (00:10:18:68:58:07)
                       Dst: Broadcom_68:58:08 (00:10:18:68:58:08)
    802.1Q Virtual LAN, PRI: 0, DEI: 0, ID: 200
    ...
    It should match the (num_of_vlans 1) rule, but it matches
    the (num_of_vlans 2) rule.
    
    The vlan tags inside the GRE or other tunnel encapsulated payload
    should not be taken into num_of_vlans.
    The fix is to stop counting the vlan number when the encapsulation
    bit is set.
    
    Fixes: 34951fcf ("flow_dissector: Add number of vlan tags dissector")
    Signed-off-by: default avatarQingqing Yang <qingqing.yang@broadcom.com>
    Reviewed-by: default avatarBoris Sukholitko <boris.sukholitko@broadcom.com>
    Link: https://lore.kernel.org/r/20220919074808.136640-1-qingqing.yang@broadcom.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
    9f87eb42
flow_dissector.c 52.2 KB