From: K. Den Date: Mon, 31 Jul 2017 16:05:39 +0000 (+0900) Subject: gue: fix remcsum when GRO on and CHECKSUM_PARTIAL boundary is outer UDP X-Git-Tag: v4.1.12-111.0.20170918_2215~166 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5953bfc0c9cf9442d40c127bd45aecbb22477ca3;p=users%2Fjedix%2Flinux-maple.git gue: fix remcsum when GRO on and CHECKSUM_PARTIAL boundary is outer UDP In the case that GRO is turned on and the original received packet is CHECKSUM_PARTIAL, if the outer UDP header is exactly at the last csum-unnecessary point, which for instance could occur if the packet comes from another Linux guest on the same Linux host, we have to do either remcsum_adjust or set up CHECKSUM_PARTIAL again with its csum_start properly reset considering RCO. However, since b7fe10e5ebac ("gro: Fix remcsum offload to deal with frags in GRO") that barrier in such case could be skipped if GRO turned on, hence we pass over it and the inner L4 validation mistakenly reckons it as a bad csum. This patch makes remcsum_offload being reset at the same time of GRO remcsum cleanup, so as to make it work in such case as before. Fixes: b7fe10e5ebac ("gro: Fix remcsum offload to deal with frags in GRO") Signed-off-by: Koichiro Den Signed-off-by: David S. Miller Orabug: 25879842 (cherry picked from commit 1bff8a0c1f8c236209ee369b7952751c04eaa71a) Signed-off-by: Cathy Zhou Reviewed-by: Jack Vogel --- diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c index 6a4245b2aac29..6cebb87ca37f5 100644 --- a/net/ipv4/fou.c +++ b/net/ipv4/fou.c @@ -358,6 +358,7 @@ out_unlock: out: NAPI_GRO_CB(skb)->flush |= flush; skb_gro_remcsum_cleanup(skb, &grc); + skb->remcsum_offload = 0; return pp; }