From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792673916; b=fVRjXlLDy/aK3Br08Cvo+2OFN/gPiJtHP6YDsSCkzKRxWFkLiIVZ1IrSkwX8V475Pu+5 boyra2tOWae7SIlB6PHekjNtsX+znaouyAyTi3ZuetiUqLBgeVKu2mV2uiFPU6eTmoaB+ eaeXo5Jt7ZmGUTkutRcTxuO04KKIYuGVitcEoKQr0zEokH2QmB1zCM0+cEIy/StfPFcis HkykIh3XJhAU0FSIZEEq7a88EhpZe9+JZsAg6679i4ltiTq5dQ2PTiZ0CBr3GqvfNzdMG N1Hhz8NeOX6y1Eg0LuClSTaCCh5XJ76u1wprfUjG3NK3xs3ngRMylAS1sBxgmryx5tw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792673916; h=DMARC-Filter:DKIM-Signature:Received:X-MC-Unique: X-Mimecast-MFC-AGG-ID:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:X-Received:Received:Date:From: To:Cc:Subject:Message-ID:References:MIME-Version:Content-Type: Content-Disposition:In-Reply-To:X-Mailer:X-Mutt-Fcc; bh=kotNI+NV8koDhHE4Okh6cXBlCdjWFXScAsrnexeAUHw=; b=pcw0tuwii86+VzdyxwHDKjhwB6H4ZN2IzmKZ31UnpLKDU477eyg0x0i7EvrvL8wb3h0V D8FW1QmPqbFaKbaI7Whpd2RMNhK9PGeryjCO7M/RlooBZBzlgZ55/VxgTNykknp9ruBYs bxz3kKQ0WzjkA8/9Nb4jfm08OWjZw3E5mzZeG6SHypFcP92TZp0T0LXI7z3UKJ2BQatYg fhwz/ifj0fn5f/F9jpHRR+yYRfyJU5JqtzxIKtgt16V86Z+MgwTtZge8/GoBHBUXObfq3 Iurk6cGk9VZmpamun1fsBB9xEl7DdxSVW1+OO4nWyRhVERAc+L4AJ2QFsfTMrv70Cwg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BVhAC2n9; dkim=pass header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=google header.b=QMG4QEV4; arc=none smtp.remote-ip=170.10.133.124 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C48160A3806 for ; Thu, 22 Oct 2026 12:58:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 9C48160A3806 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BVhAC2n9; dkim=pass (2048-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=google header.b=QMG4QEV4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1792673914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kotNI+NV8koDhHE4Okh6cXBlCdjWFXScAsrnexeAUHw=; b=BVhAC2n9JHxM49DObKbM/nuVFdvR++IGzarXFA41LE4K3BhErEFn/oOrysfvi8p62IOowd TzJxsMR3jtMyY9C9wgiFm48bR97IY1l5EJjZfp6oQbyjykN/cxl0U+WlLx4QoxJF5Gf19o Xrey7lwtaJ0eOnVKNTqhehZX6BCIpeo= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-ilPerWLvNFq8xndTIg9ILQ-1; Thu, 22 Oct 2026 12:58:27 +0000 X-MC-Unique: ilPerWLvNFq8xndTIg9ILQ-1 X-Mimecast-MFC-AGG-ID: ilPerWLvNFq8xndTIg9ILQ_1792673906 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-48b02d63407so1184301f8f.0 for ; Thu, 22 Oct 2026 05:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1792673906; x=1793278706; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=kotNI+NV8koDhHE4Okh6cXBlCdjWFXScAsrnexeAUHw=; b=QMG4QEV49fZe5ws1VbdM/x5dcWdh0Ve//Fsm8F8xqXVGUxxte0UD5HXhJSrDzxZjkM FNxMPsPVBcPFYggBYvMxaUoouadikrargATm4CYDLE5wQsuj35kxXxQAuzR4+pg/Wap0 F/YKWRmHulkBym/Ct/N37epnpSrINSnRBnSIWAv06ekei6+U7sJas3xonCxNbVJUb/tF o9uX7+Dyk2cRFWu6QhDI0xrgdYxjGOE2PH6R2htPa2A18DLXaBqwoudI9K71vvEO8SWx YfLB1Nerj51GJ5gLqMrAy7doAqiN3B8A4WW+VtjNmwR1boaMSFc2HcuF1RkzShvYTQCz RcOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792673906; x=1793278706; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=kotNI+NV8koDhHE4Okh6cXBlCdjWFXScAsrnexeAUHw=; b=yWx52LdVdmXhUnv06AEgLieLNeYL4OjAftTcg6bXk0OlquIVsMZvNLW7XuwQF8x8aj F2Y0Av4J94A43Q40fQTnvsmo2YSHBYIvxyRCXd2YP3nQZdsM4vC4biDlfnoSAc7h0Evk k6ydJGQF3XW8XBQk4MuvmTXB2I8DiSpNuCrSSQ+2zaJl0TzsVWABvo0wWXqmwI1abENk sXHEv66VkZwyUUMb7A3pyrIwbRW7LS5nc6bwpBkjy8mldXCOPVmiohyF80Xjj8f5gAyn J3h+M0xmBNOY7gh60Pfmj0Bj9A1/FgHXESRy9SKHUqH6BcMZIjj4ykdXKqDPYhZwbp6/ /OEQ== X-Gm-Message-State: AFq9FYLtwziOkiBkh9tq85+znG9mtWYmZU2ErKqXvw1jfuuhdUKL/BkE DFY3teRYXaJGPRyZ85GKSBHWcz7wskS3HhnactWs12HFvKlqM7kWABaxi6ufJxT7ZHOBVr3BmF4 Pd9XRRWGclv+ZWoLCSKjfJG/7Xucon59oFd4vaRELNRR7Och/GHLuGAMeRgcv3mqhH/DlFgKqW7 KuFCWQ4vyB2KZ12AIJRPfiSmjzPLABw8iVd2FT58LvEIs= X-Gm-Gg: AYBFou39KMJWd/Kf5cnfS5FrYXzfUGeLdSr/m115zCdlsYRwR4LPjH4LfpiX+NdGcGZ b8jSuHuPDdbGBoq6uDoF+i1rpofsuTXcg/I5ueW9tQ1s5Kdelf9aFr12TVFYHGT+BmPs7ucuXOq Dfmvq+Dnt+Iq47Lx9ReDWIegEj7MbkEMDvA6hDxNFt9TUdcO8nvC5gk2AIaudS4pf39RP4YYixt lZeN88qP9QM/uGuh8t7chy/lpOwDK0Tm0e+s3tYasP05N4qxikVIFlaMnUhq4WEMa24pEsbcuMM zveY5qpZ9V85+yv6ytZUQJApKDrVrHUsneaY6jwjljuu/HWI7gqWznvhLdUovSI4KW0= X-Received: by 2002:a05:6000:186b:b0:48d:fdc0:8bf2 with SMTP id ffacd0b85a97d-48e264d6ac5mr10492470f8f.41.1792673905737; Thu, 22 Oct 2026 05:58:25 -0700 (PDT) X-Received: by 2002:a05:6000:186b:b0:48d:fdc0:8bf2 with SMTP id ffacd0b85a97d-48e264d6ac5mr10492388f8f.41.1792673904824; Thu, 22 Oct 2026 05:58:24 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:1536:fc00:b838:383:1c7:6e81]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48e254f093asm12758884f8f.4.2026.10.22.05.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2026 05:58:21 -0700 (PDT) Date: Thu, 22 Oct 2026 08:58:18 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Willem de Bruijn , Chris Arges , =?utf-8?B?QmrDtnJuIFTDtnBlbA==?= , Phil Sutter , Jason Wang , Eugenio =?utf-8?B?UMOpcmV6?= , Xuan Zhuo , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, virtualization@lists.linux.dev, Max Krasnyansky , Rusty Russell , Paulos Yibelo Subject: [PATCH net v5 4/7] net: resolve uncommon partial checksums at ingress Message-ID: <342bf5331e12b2e5b940510293233bb8bce46127.1792668082.git.mst@redhat.com> References: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.51.2.2891.g4157995a80.dirty X-Mutt-Fcc: =sent As reported first by Paulos Yibelo (after which others, credited below, found more ways the bug can affect users) a virtio net header can place CHECKSUM_PARTIAL at any in-packet offset. If that state is retained, later checksum completion can modify the packet after protocol processing has made decisions from it. Let's fix that: let's validate csum_start and csum_offset and only keep CHECKSUM_PARTIAL when csum_start and csum_offset match a parsed TCP or UDP header, while handling VLAN headers, IPv4 options and IPv6 extension headers. Complete other non-GSO checksums immediately, before any protocol processing runs. We can't easily "complete the checksum" for GSO we don't recognize - GSO assumes knowledge of the protocol. We could segment ignoring the checksum then do whatever csum_start and csum_offset say, but that seems like an overkill for something that shouldn't happen. There's some risk here: - non-gso packets which can't be parsed get checksum calculated in software, adding performance overhead - gso packets which can't be parsed get dropped Note that for zero copy, userspace can change the data after the checksum has been calculated. This is fundamental to zero copy by design, and the only outcome is a bad checksum and a packet drop. To mitigate the risks, the following patch will add a sysctl knob to bypass the resolution. This is reasonable if the setup is such that there is no protocol processing at all. UDP tunnel headers get the same handling on the inner header. Packets without VIRTIO_NET_HDR_F_NEEDS_CSUM are unaffected. Reported-by: Paulos Yibelo Reported-by: Chris Arges Tested-by: Chris Arges Fixes: f43798c27684 ("tun: Allow GSO using virtio_net_hdr") Suggested-by: Willem de Bruijn Signed-off-by: Michael S. Tsirkin --- Notes (changelog): v4->v5: caller changes moved to "account for ingress-resolved virtio net hdr state" (Willem de Bruijn) a packet too small to be GSO: ignore the tunnel GSO request, complete wild metadata in place (sashiko) document the zero copy interaction (sashiko) honor a preset skb->protocol on ethernet: the stack uses it, except on loopback which re-parses the frame (sashiko) include/linux/virtio_net.h | 283 ++++++++++++++++++++++++++++++++++++- 1 file changed, 279 insertions(+), 4 deletions(-) diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h index 013c6c7e2dea..52852a33a2db 100644 --- a/include/linux/virtio_net.h +++ b/include/linux/virtio_net.h @@ -5,7 +5,11 @@ #include #include #include +#include #include +#include +#include +#include #include #include #include @@ -48,6 +52,205 @@ static inline int virtio_net_hdr_set_proto(struct sk_buff *skb, return 0; } +/* TODO: nothing virtio specific here, move to ip.h */ + +/* + * Pull and minimally validate the IPv4 header at @nhoff. + * Returns the header and stores the transport header offset in + * @thoff, or NULL if truncated or malformed. Only the fixed header + * is guaranteed linear; callers that need the options or the + * transport header must pull further. + */ +static inline struct iphdr *virtio_net_ip4_parse(struct sk_buff *skb, + unsigned int nhoff, + unsigned int *thoff) +{ + struct iphdr *iph; + + if (!pskb_may_pull(skb, nhoff + sizeof(struct iphdr))) + return NULL; + + iph = (struct iphdr *)(skb->data + nhoff); + if (iph->version != 4 || + iph->ihl < sizeof(struct iphdr) / sizeof(u32)) + return NULL; + + *thoff = nhoff + iph->ihl * sizeof(u32); + return iph; +} + +/* Where does the L3 header start, and what protocol is it? + * Handles Ethernet and VLAN headers; other devices use the + * network header offset the caller set up. + */ +static inline bool +virtio_net_l3_start(struct sk_buff *skb, int *nhoff, __be16 *proto) +{ + /* skb->dev is only guaranteed to be set since 44378d02c5aa + * ("net: always dissect GSO packets in + * __virtio_net_hdr_to_skb()"), do not crash when it is not. + */ + if (WARN_ON_ONCE(!skb->dev)) + return false; + + /* A preset protocol is what the stack will use, except on + * loopback which re-parses the frame: loopback_xmit() calls + * eth_type_trans() on it. + */ + if (skb->dev->type == ARPHRD_ETHER || + skb->dev->type == ARPHRD_LOOPBACK) { + if (!pskb_may_pull(skb, ETH_HLEN)) + return false; + *nhoff = ETH_HLEN; + *proto = skb->protocol; + if (!*proto || skb->dev->type == ARPHRD_LOOPBACK) + *proto = eth_hdr(skb)->h_proto; + if (eth_type_vlan(*proto)) { + *proto = __vlan_get_protocol(skb, *proto, nhoff); + if (!*proto) + return false; + } + } else { + *nhoff = skb_network_offset(skb); + /* An unset network header shows up as an offset + * outside of the packet. + */ + if (*nhoff < 0 || (unsigned int)*nhoff >= skb->len) + return false; + *proto = skb->protocol; + if (!*proto) { + const struct iphdr *iph; + + /* A packet socket bound to ETH_P_ALL leaves the + * protocol unset: infer it from the IP version + * at the network header. + */ + if (!pskb_may_pull(skb, *nhoff + 1)) + return false; + iph = (const struct iphdr *)(skb->data + *nhoff); + if (iph->version == 4) + *proto = htons(ETH_P_IP); + else if (iph->version == 6) + *proto = htons(ETH_P_IPV6); + } + } + return true; +} + +/* Walk the L3 header at @nhoff: where does its transport header + * start, and which protocol is it? Returns false if the header + * is truncated, malformed or fragmented. + */ +static inline bool +virtio_net_l4_start(struct sk_buff *skb, unsigned int nhoff, __be16 proto, + unsigned int *thoff, int *ip_proto) +{ + if (proto == htons(ETH_P_IP)) { + const struct iphdr *iph = virtio_net_ip4_parse(skb, nhoff, thoff); + + if (!iph || ip_is_fragment(iph)) + return false; + *ip_proto = iph->protocol; + return true; + } + + if (proto == htons(ETH_P_IPV6)) { + const struct ipv6hdr *iph; + int flags = 0; + + if (!pskb_may_pull(skb, nhoff + sizeof(*iph))) + return false; + iph = (const void *)(skb->data + nhoff); + if (iph->version != 6) + return false; + *thoff = nhoff + sizeof(*iph); + *ip_proto = iph->nexthdr; + if (*ip_proto != IPPROTO_TCP && *ip_proto != IPPROTO_UDP) { + *thoff = nhoff; + /* Find the transport header behind any + * extension headers, AH included. + */ + *ip_proto = ipv6_find_hdr(skb, thoff, -1, NULL, + &flags); + if (*ip_proto < 0 || flags & IP6_FH_F_FRAG) + return false; + } + return true; + } + + return false; +} + +/* Does checksum metadata match a known TCP or UDP header? */ +static inline bool +virtio_net_csum_partial_ok_at_offset(struct sk_buff *skb, u8 hdr_gso_type, + unsigned int nhoff, __be16 proto) +{ + unsigned int thoff; + int ip_proto; + + if (!virtio_net_l4_start(skb, nhoff, proto, &thoff, &ip_proto)) + return false; + + if (skb_checksum_start_offset(skb) != thoff) + return false; + + switch (ip_proto) { + case IPPROTO_TCP: + if (skb->csum_offset != offsetof(struct tcphdr, check) || + !pskb_may_pull(skb, thoff + sizeof(struct tcphdr))) + return false; + break; + case IPPROTO_UDP: + if (skb->csum_offset != offsetof(struct udphdr, check) || + !pskb_may_pull(skb, thoff + sizeof(struct udphdr))) + return false; + break; + default: + return false; + } + + switch (hdr_gso_type & ~VIRTIO_NET_HDR_GSO_ECN) { + case VIRTIO_NET_HDR_GSO_NONE: + return true; + case VIRTIO_NET_HDR_GSO_TCPV4: + return proto == htons(ETH_P_IP) && ip_proto == IPPROTO_TCP; + case VIRTIO_NET_HDR_GSO_TCPV6: + return proto == htons(ETH_P_IPV6) && ip_proto == IPPROTO_TCP; + case VIRTIO_NET_HDR_GSO_UDP: + case VIRTIO_NET_HDR_GSO_UDP_L4: + return ip_proto == IPPROTO_UDP; + default: + return false; + } +} + +static inline bool +virtio_net_csum_partial_ok(struct sk_buff *skb, u8 hdr_gso_type) +{ + int nhoff; + __be16 proto; + + if (!virtio_net_l3_start(skb, &nhoff, &proto)) + return false; + + return virtio_net_csum_partial_ok_at_offset(skb, hdr_gso_type, nhoff, + proto); +} + +/* + * Handle a packet whose checksum metadata does not match the packet: + * GSO packets are dropped, as segmentation needs one checksum per + * segment; others are completed in software. + */ +static inline int __virtio_net_resolve_csum_partial_mismatch(struct sk_buff *skb) +{ + if (skb_is_gso(skb)) + return -EINVAL; + + return skb_checksum_help(skb) ?: 1; +} + static inline int __virtio_net_hdr_to_skb(struct sk_buff *skb, const struct virtio_net_hdr *hdr, bool little_endian, u8 hdr_gso_type) @@ -194,11 +397,35 @@ static inline int __virtio_net_hdr_to_skb(struct sk_buff *skb, return 0; } +/* + * Return value: + * 0 - success + * >0 - checksum was completed in software (slow path) + * <0 - failure + */ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb, const struct virtio_net_hdr *hdr, bool little_endian) { - return __virtio_net_hdr_to_skb(skb, hdr, little_endian, hdr->gso_type); + typeof(skb->transport_header) old_transport = skb->transport_header; + int ret = __virtio_net_hdr_to_skb(skb, hdr, little_endian, + hdr->gso_type); + + if (ret < 0) + return ret; + + if (skb->ip_summed != CHECKSUM_PARTIAL || + virtio_net_csum_partial_ok(skb, hdr->gso_type)) + return 0; + + /* + * Here we do not trust the checksum metadata. + * __virtio_net_hdr_to_skb set the transport header to csum_start + * from virtio hdr, restore it to a known good value. + */ + skb->transport_header = old_transport; + + return __virtio_net_resolve_csum_partial_mismatch(skb); } /* This function must be called after virtio_net_hdr_from_skb(). */ @@ -282,6 +509,35 @@ static inline unsigned int virtio_l3min(bool is_ipv6) return is_ipv6 ? sizeof(struct ipv6hdr) : sizeof(struct iphdr); } +/* Do the tunnel offsets match the outer headers in the frame? + * The L3 header the tunnel claims must be the one the frame + * carries, with UDP following it at @outer_th. + */ +static inline bool +virtio_net_tnl_offsets_ok(struct sk_buff *skb, bool outer_isv6, + unsigned int outer_th) +{ + int nhoff; + __be16 proto; + unsigned int thoff; + int ip_proto; + + if (!virtio_net_l3_start(skb, &nhoff, &proto)) + return false; + if (outer_isv6 != (proto == htons(ETH_P_IPV6))) + return false; + if (!virtio_net_l4_start(skb, nhoff, proto, &thoff, &ip_proto)) + return false; + + return ip_proto == IPPROTO_UDP && outer_th == thoff; +} + +/* + * Return value: + * 0 - success + * >0 - checksum was completed in software (slow path) + * <0 - failure + */ static inline int virtio_net_hdr_tnl_to_skb(struct sk_buff *skb, const struct virtio_net_hdr_v1_hash_tunnel *vhdr, @@ -293,6 +549,7 @@ virtio_net_hdr_tnl_to_skb(struct sk_buff *skb, unsigned int inner_nh, outer_th, inner_th; unsigned int inner_l3min, outer_l3min; u8 gso_inner_type, gso_tunnel_type; + __be16 inner_proto; bool outer_isv6, inner_isv6; int ret; @@ -335,9 +592,12 @@ virtio_net_hdr_tnl_to_skb(struct sk_buff *skb, /* Let the basic parsing deal with plain GSO features. */ ret = __virtio_net_hdr_to_skb(skb, hdr, true, hdr->gso_type & ~gso_tunnel_type); - if (ret) + if (ret < 0) return ret; + if (!virtio_net_tnl_offsets_ok(skb, outer_isv6, outer_th)) + return -EINVAL; + /* In case of USO, the inner protocol is still unknown and * `inner_isv6` is just a guess, additional parsing is needed. * The previous validation ensures that accessing an ipv4 inner @@ -353,7 +613,7 @@ virtio_net_hdr_tnl_to_skb(struct sk_buff *skb, } skb_set_inner_protocol(skb, inner_isv6 ? htons(ETH_P_IPV6) : - htons(ETH_P_IP)); + htons(ETH_P_IP)); if (hdr->flags & VIRTIO_NET_HDR_F_UDP_TUNNEL_CSUM) { if (!tnl_csum_negotiated) return -EINVAL; @@ -368,7 +628,22 @@ virtio_net_hdr_tnl_to_skb(struct sk_buff *skb, skb->inner_mac_header = inner_nh + skb_headroom(skb); skb->transport_header = outer_th + skb_headroom(skb); skb->encapsulation = 1; - return 0; + + if (!skb_is_gso(skb)) + skb_shinfo(skb)->gso_type &= ~(SKB_GSO_UDP_TUNNEL_CSUM | + SKB_GSO_UDP_TUNNEL); + + /* + * We know VIRTIO_NET_HDR_F_NEEDS_CSUM was set so __virtio_net_hdr_to_skb + * set CHECKSUM_PARTIAL. + */ + inner_proto = inner_isv6 ? htons(ETH_P_IPV6) : htons(ETH_P_IP); + if (virtio_net_csum_partial_ok_at_offset(skb, gso_inner_type, inner_nh, + inner_proto)) + return 0; + + /* A tunnel header implies GSO, so drop. */ + return __virtio_net_resolve_csum_partial_mismatch(skb); } /* Checksum-related fields validation for the driver */ -- MST