From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Phillip Potter <phil@philpotter.co.uk>,
Eric Dumazet <edumazet@google.com>,
syzbot+2e406a9ac75bb71d4b7a@syzkaller.appspotmail.com,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.11 11/23] net: geneve: check skb is large enough for IPv4/IPv6 header
Date: Mon, 19 Apr 2021 16:43:30 -0400 [thread overview]
Message-ID: <20210419204343.6134-11-sashal@kernel.org> (raw)
In-Reply-To: <20210419204343.6134-1-sashal@kernel.org>
From: Phillip Potter <phil@philpotter.co.uk>
[ Upstream commit 6628ddfec7580882f11fdc5c194a8ea781fdadfa ]
Check within geneve_xmit_skb/geneve6_xmit_skb that sk_buff structure
is large enough to include IPv4 or IPv6 header, and reject if not. The
geneve_xmit_skb portion and overall idea was contributed by Eric Dumazet.
Fixes a KMSAN-found uninit-value bug reported by syzbot at:
https://syzkaller.appspot.com/bug?id=abe95dc3e3e9667fc23b8d81f29ecad95c6f106f
Suggested-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot+2e406a9ac75bb71d4b7a@syzkaller.appspotmail.com
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/geneve.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index f35b0b83fe85..040edc6fc560 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -891,6 +891,9 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev,
__be16 sport;
int err;
+ if (!pskb_network_may_pull(skb, sizeof(struct iphdr)))
+ return -EINVAL;
+
sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
rt = geneve_get_v4_rt(skb, dev, gs4, &fl4, info,
geneve->cfg.info.key.tp_dst, sport);
@@ -985,6 +988,9 @@ 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)))
+ return -EINVAL;
+
sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
dst = geneve_get_v6_dst(skb, dev, gs6, &fl6, info,
geneve->cfg.info.key.tp_dst, sport);
--
2.30.2
next prev parent reply other threads:[~2021-04-19 20:44 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 20:43 [PATCH AUTOSEL 5.11 01/23] HID: google: add don USB id Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 02/23] HID: asus: Add support for 2021 ASUS N-Key keyboard Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 03/23] HID: alps: fix error return code in alps_input_configured() Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 04/23] HID cp2112: fix support for multiple gpiochips Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 05/23] HID: wacom: Assign boolean values to a bool variable Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 06/23] soc: qcom: geni: shield geni_icc_get() for ACPI boot Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 07/23] dmaengine: xilinx: dpdma: Fix descriptor issuing on video group Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 08/23] dmaengine: xilinx: dpdma: Fix race condition in done IRQ Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 09/23] ARM: dts: Fix swapped mmc order for omap3 Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 10/23] m68k: fix flatmem memory model setup Sasha Levin
2021-04-19 20:43 ` Sasha Levin [this message]
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 12/23] dmaengine: tegra20: Fix runtime PM imbalance on error Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 13/23] s390/entry: save the caller of psw_idle Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 14/23] arm64: kprobes: Restore local irqflag if kprobes is cancelled Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 15/23] xen-netback: Check for hotplug-status existence before watching Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 16/23] cavium/liquidio: Fix duplicate argument Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 17/23] i2c: mv64xxx: Fix random system lock caused by runtime PM Sasha Levin
2021-04-20 6:30 ` Marek Behún
2021-04-25 21:41 ` Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 18/23] kasan: fix hwasan build for gcc Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 19/23] csky: change a Kconfig symbol name to fix e1000 build error Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 20/23] ia64: fix discontig.c section mismatches Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 21/23] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 22/23] gcov: clang: fix clang-11+ build Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 23/23] readdir: make sure to verify directory entry for legacy interfaces too Sasha Levin
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=20210419204343.6134-11-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=phil@philpotter.co.uk \
--cc=stable@vger.kernel.org \
--cc=syzbot+2e406a9ac75bb71d4b7a@syzkaller.appspotmail.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).