From: Phillip Potter <phil@philpotter.co.uk>
To: davem@davemloft.net
Cc: kuba@kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, edumazet@google.com
Subject: [PATCH] net: geneve: modify IP header check in geneve6_xmit_skb
Date: Thu, 22 Apr 2021 00:11:00 +0100 [thread overview]
Message-ID: <20210421231100.7467-1-phil@philpotter.co.uk> (raw)
Modify the check in geneve6_xmit_skb to use the size of a struct iphdr
rather than struct ipv6hdr. This fixes two kernel selftest failures
introduced by commit 6628ddfec758
("net: geneve: check skb is large enough for IPv4/IPv6 header"), without
diminishing the fix provided by that commit.
Reported-by: kernel test robot <oliver.sang@intel.com>
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
drivers/net/geneve.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 42f31c681846..a57a5e6f614f 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -988,7 +988,7 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
__be16 sport;
int err;
- if (!pskb_network_may_pull(skb, sizeof(struct ipv6hdr)))
+ if (!pskb_network_may_pull(skb, sizeof(struct iphdr)))
return -EINVAL;
sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
--
2.30.2
next reply other threads:[~2021-04-21 23:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-21 23:11 Phillip Potter [this message]
2021-04-22 0:39 ` [PATCH] net: geneve: modify IP header check in geneve6_xmit_skb Florian Westphal
2021-04-22 0:56 ` Phillip Potter
2021-04-22 16:03 ` Sabrina Dubroca
2021-04-22 16:52 ` Eric Dumazet
2021-04-22 17:18 ` Sabrina Dubroca
2021-04-22 21:03 ` Phillip Potter
2021-04-22 6:43 ` Eric Dumazet
2021-04-22 20:58 ` Phillip Potter
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=20210421231100.7467-1-phil@philpotter.co.uk \
--to=phil@philpotter.co.uk \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.