From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, idosch@idosch.org,
chouhan.shreyansh630@gmail.com,
Willem de Bruijn <willemb@google.com>
Subject: [PATCH net] ip_gre: validate csum_start only if CHECKSUM_PARTIAL
Date: Thu, 2 Sep 2021 15:34:47 -0400 [thread overview]
Message-ID: <20210902193447.94039-2-willemdebruijn.kernel@gmail.com> (raw)
In-Reply-To: <20210902193447.94039-1-willemdebruijn.kernel@gmail.com>
From: Willem de Bruijn <willemb@google.com>
Only test integrity of csum_start if checksum offload is configured.
With checksum offload and GRE tunnel checksum, gre_build_header will
cheaply build the GRE checksum using local checksum offload. This
depends on inner packet csum offload, and thus that csum_start points
behind GRE. But validate this condition only with checksum offload.
Link: https://lore.kernel.org/netdev/YS+h%2FtqCJJiQei+W@shredder/
Fixes: 1d011c4803c7 ("ip_gre: add validation for csum_start")
Signed-off-by: Willem de Bruijn <willemb@google.com>
---
net/ipv4/ip_gre.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 177d26d8fb9c..09311992a617 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -473,8 +473,11 @@ static void __gre_xmit(struct sk_buff *skb, struct net_device *dev,
static int gre_handle_offloads(struct sk_buff *skb, bool csum)
{
- if (csum && skb_checksum_start(skb) < skb->data)
+ /* Local checksum offload requires csum offload of the inner packet */
+ if (csum && skb->ip_summed == CHECKSUM_PARTIAL &&
+ 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
next prev parent reply other threads:[~2021-09-02 19:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-02 19:34 [PATCH net] ip6_gre: validate csum_start only if CHECKSUM_PARTIAL Willem de Bruijn
2021-09-02 19:34 ` Willem de Bruijn [this message]
2021-09-02 20:25 ` [PATCH net] ip_gre: " Alexander Duyck
2021-09-02 20:29 ` Willem de Bruijn
2021-09-02 21:17 ` Alexander Duyck
2021-09-02 21:44 ` Willem de Bruijn
2021-09-03 2:01 ` Alexander Duyck
2021-09-03 2:40 ` Willem de Bruijn
2021-09-03 16:46 ` Alexander Duyck
2021-09-03 19:38 ` Willem de Bruijn
2021-09-03 23:13 ` Alexander Duyck
2021-09-04 14:45 ` Willem de Bruijn
2021-09-04 15:35 ` Alexander Duyck
2021-09-04 21:40 ` Willem de Bruijn
2021-09-04 21:53 ` Alexander Duyck
2021-09-04 22:05 ` Willem de Bruijn
2021-09-04 23:47 ` Alexander Duyck
2021-09-05 15:24 ` Willem de Bruijn
2021-09-05 15:53 ` Alexander Duyck
2021-09-06 3:02 ` Willem de Bruijn
2021-09-02 20:27 ` [PATCH net] ip6_gre: " Alexander Duyck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210902193447.94039-2-willemdebruijn.kernel@gmail.com \
--to=willemdebruijn.kernel@gmail.com \
--cc=chouhan.shreyansh630@gmail.com \
--cc=davem@davemloft.net \
--cc=idosch@idosch.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).