Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH net] ip6_gre: Revert "ip6_gre: add validation for csum_start"
@ 2021-09-06 14:27 Willem de Bruijn
  2021-09-06 15:50 ` patchwork-bot+netdevbpf
  0 siblings, 1 reply; 2+ messages in thread
From: Willem de Bruijn @ 2021-09-06 14:27 UTC (permalink / raw)
  To: netdev
  Cc: davem, kuba, idosch, chouhan.shreyansh630, alexander.duyck,
	Willem de Bruijn

From: Willem de Bruijn <willemb@google.com>

This reverts commit 9cf448c200ba9935baa94e7a0964598ce947db9d.

This commit was added for equivalence with a similar fix to ip_gre.
That fix proved to have a bug. Upon closer inspection, ip6_gre is not
susceptible to the original bug.

So revert the unnecessary extra check.

In short, ipgre_xmit calls skb_pull to remove ipv4 headers previously
inserted by dev_hard_header. ip6gre_tunnel_xmit does not.

Link: https://lore.kernel.org/netdev/CA+FuTSe+vJgTVLc9SojGuN-f9YQ+xWLPKE_S4f=f+w+_P2hgUg@mail.gmail.com/#t
Fixes: 9cf448c200ba ("ip6_gre: add validation for csum_start")
Signed-off-by: Willem de Bruijn <willemb@google.com>
---
 net/ipv6/ip6_gre.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 7baf41d160f5..3ad201d372d8 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -629,8 +629,6 @@ static int gre_rcv(struct sk_buff *skb)
 
 static int gre_handle_offloads(struct sk_buff *skb, bool csum)
 {
-	if (csum && skb_checksum_start(skb) < skb->data)
-		return -EINVAL;
 	return iptunnel_handle_offloads(skb,
 					csum ? SKB_GSO_GRE_CSUM : SKB_GSO_GRE);
 }
-- 
2.33.0.153.gba50c8fa24-goog


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH net] ip6_gre: Revert "ip6_gre: add validation for csum_start"
  2021-09-06 14:27 [PATCH net] ip6_gre: Revert "ip6_gre: add validation for csum_start" Willem de Bruijn
@ 2021-09-06 15:50 ` patchwork-bot+netdevbpf
  0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-09-06 15:50 UTC (permalink / raw)
  To: Willem de Bruijn
  Cc: netdev, davem, kuba, idosch, chouhan.shreyansh630,
	alexander.duyck, willemb

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Mon,  6 Sep 2021 10:27:38 -0400 you wrote:
> From: Willem de Bruijn <willemb@google.com>
> 
> This reverts commit 9cf448c200ba9935baa94e7a0964598ce947db9d.
> 
> This commit was added for equivalence with a similar fix to ip_gre.
> That fix proved to have a bug. Upon closer inspection, ip6_gre is not
> susceptible to the original bug.
> 
> [...]

Here is the summary with links:
  - [net] ip6_gre: Revert "ip6_gre: add validation for csum_start"
    https://git.kernel.org/netdev/net/c/fe63339ef36b

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-06 15:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-06 14:27 [PATCH net] ip6_gre: Revert "ip6_gre: add validation for csum_start" Willem de Bruijn
2021-09-06 15:50 ` patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).