• B
    tun: fix vlan packet truncation · 81c89507
    Bjørn Mork 提交于
    Bogus trimming in tun_net_xmit() causes truncated vlan packets.
    
    skb->len is correct whether or not skb_vlan_tag_present() is true. There
    is no more reason to adjust the skb length on xmit in this driver than
    any other driver. tun_put_user() adds 4 bytes to the total for tagged
    packets because it transmits the tag inline to userspace.  This is
    similar to a nic transmitting the tag inline on the wire.
    
    Reproducing the bug by sending any tagged packet through back-to-back
    connected tap interfaces:
    
     socat TUN,tun-type=tap,iff-up,tun-name=in TUN,tun-type=tap,iff-up,tun-name=out &
     ip link add link in name in.20 type vlan id 20
     ip addr add 10.9.9.9/24 dev in.20
     ip link set in.20 up
     tshark -nxxi in -f arp -c1 2>/dev/null &
     tshark -nxxi out -f arp -c1 2>/dev/null &
     ping -c 1 10.9.9.5 >/dev/null 2>&1
    
    The output from the 'in' and 'out' interfaces are different when the
    bug is present:
    
     Capturing on 'in'
     0000  ff ff ff ff ff ff 76 cf 76 37 d5 0a 81 00 00 14   ......v.v7......
     0010  08 06 00 01 08 00 06 04 00 01 76 cf 76 37 d5 0a   ..........v.v7..
     0020  0a 09 09 09 00 00 00 00 00 00 0a 09 09 05         ..............
    
     Capturing on 'out'
     0000  ff ff ff ff ff ff 76 cf 76 37 d5 0a 81 00 00 14   ......v.v7......
     0010  08 06 00 01 08 00 06 04 00 01 76 cf 76 37 d5 0a   ..........v.v7..
     0020  0a 09 09 09 00 00 00 00 00 00                     ..........
    
    Fixes: aff3d70a ("tun: allow to attach ebpf socket filter")
    Cc: Jason Wang <jasowang@redhat.com>
    Signed-off-by: NBjørn Mork <bjorn@mork.no>
    Acked-by: NJason Wang <jasowang@redhat.com>
    Signed-off-by: NDavid S. Miller <davem@davemloft.net>
    81c89507
tun.c 81.1 KB