[PATCH v2 net 0/2] net: always dissect GSO packets in __virtio_net_hdr_to_skb()
From: Eric Dumazet <edumazet@kernel.org>
Date: 2026-09-28 14:43:01
This series fixes a bypass of untrusted GSO flow dissection in __virtio_net_hdr_to_skb() when VIRTIO_NET_HDR_F_NEEDS_CSUM is not set, and adds a kselftest covering VLAN-tagged GSO packets without NEEDS_CSUM: - Patch 1 initializes skb->dev and skb->network_header before calling virtio_net_hdr_*_to_skb() in tun_get_user(), tun_xdp_one(), virtnet_receive_done(), and raw_verify_header(), removes the '&& skb->network_header' condition and the unvalidated 'else if (gso_type)' fallback in __virtio_net_hdr_to_skb(), and moves virtio_net_hdr_match_proto() after skb_flow_dissect_flow_keys_basic() so it validates the dissected L3 protocol (keys.basic.n_proto) rather than the outer L2 protocol. - Patch 2 adds a kselftest in tools/testing/selftests/net/tun.c verifying that VLAN-tagged (802.1Q) TCPv4 GSO packets without NEEDS_CSUM (both flags = 0 and flags = VIRTIO_NET_HDR_F_DATA_VALID) are accepted on a TAP device, and that mismatched GSO types and truncated headers without NEEDS_CSUM are rejected with -EINVAL. v2: - Patch 1: drop the pre-dissection virtio_net_hdr_match_proto() check inside 'if (!skb->protocol)' so VLAN-tagged GSO frames without NEEDS_CSUM are not rejected before flow dissection (Michael S. Tsirkin). - Patch 1: clarify the changelog regarding why skb->network_header was 0 in those callers and why skb_reset_mac_header() is dropped in tun_get_user() for IFF_TUN (Michael S. Tsirkin). - Patch 2: add selftest in tools/testing/selftests/net/tun.c based on Michael's reproducer. - Link to v1: https://lore.kernel.org/netdev/20260927195536.2489079-1-edumazet@google.com/ (local) Eric Dumazet (2): net: always dissect GSO packets in __virtio_net_hdr_to_skb() selftests: net: tun: add test for VLAN-tagged GSO without NEEDS_CSUM arch/um/drivers/vector_transports.c | 1 + drivers/net/tun.c | 23 +++--- drivers/net/virtio_net.c | 2 + include/linux/virtio_net.h | 60 +++++++--------- tools/testing/selftests/net/tun.c | 107 ++++++++++++++++++++++++++++ 5 files changed, 149 insertions(+), 44 deletions(-) -- 2.56.0.rc1.315.gc6ed9934b7-goog