From: Phillip Potter <phil@philpotter.co.uk>
To: Eric Dumazet <edumazet@google.com>
Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com,
netdev@vger.kernel.org, eric.dumazet@gmail.com,
syzbot+9ee20ec1de7b3168db09@syzkaller.appspotmail.com,
sd@queasysnail.net
Subject: Re: [PATCH v4 net] geneve: fix header validation in geneve[6]_xmit_skb
Date: Sat, 6 Apr 2024 20:22:06 +0100 [thread overview]
Message-ID: <ZhGg3kRHpARQAv9b@equinox> (raw)
In-Reply-To: <20240405103035.171380-1-edumazet@google.com>
On Fri, Apr 05, 2024 at 10:30:34AM +0000, Eric Dumazet wrote:
> syzbot is able to trigger an uninit-value in geneve_xmit() [1]
>
> Problem : While most ip tunnel helpers (like ip_tunnel_get_dsfield())
> uses skb_protocol(skb, true), pskb_inet_may_pull() is only using
> skb->protocol.
>
> If anything else than ETH_P_IPV6 or ETH_P_IP is found in skb->protocol,
> pskb_inet_may_pull() does nothing at all.
>
> If a vlan tag was provided by the caller (af_packet in the syzbot case),
> the network header might not point to the correct location, and skb
> linear part could be smaller than expected.
>
> Add skb_vlan_inet_prepare() to perform a complete mac validation.
>
> Use this in geneve for the moment, I suspect we need to adopt this
> more broadly.
>
> v4 - Jakub reported v3 broke l2_tos_ttl_inherit.sh selftest
> - Only call __vlan_get_protocol() for vlan types.
> Link: https://lore.kernel.org/netdev/20240404100035.3270a7d5@kernel.org/
>
> v2,v3 - Addressed Sabrina comments on v1 and v2
> Link: https://lore.kernel.org/netdev/Zg1l9L2BNoZWZDZG@hog/
>
> [1]
>
Hi Eric,
Looks good.
Reviewed-by: Phillip Potter <phil@philpotter.co.uk>
Regards,
Phil
next prev parent reply other threads:[~2024-04-06 19:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 10:30 [PATCH v4 net] geneve: fix header validation in geneve[6]_xmit_skb Eric Dumazet
2024-04-05 21:19 ` Sabrina Dubroca
2024-04-06 19:22 ` Phillip Potter [this message]
2024-04-08 11:00 ` patchwork-bot+netdevbpf
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=ZhGg3kRHpARQAv9b@equinox \
--to=phil@philpotter.co.uk \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eric.dumazet@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sd@queasysnail.net \
--cc=syzbot+9ee20ec1de7b3168db09@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 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.