From: Simon Horman <horms@kernel.org>
To: Florian Westphal <fw@strlen.de>
Cc: netdev@vger.kernel.org, sbrivio@redhat.com,
"David S. Miller" <davem@davemloft.net>,
dsahern@kernel.org, Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
shuah@kernel.org
Subject: Re: [PATCH net 1/2] tunnels: fix kasan splat when generating ipv4 pmtu error
Date: Sat, 5 Aug 2023 09:07:30 +0200 [thread overview]
Message-ID: <ZM31Mnl3yhYLMouc@vergenet.net> (raw)
In-Reply-To: <20230803152653.29535-2-fw@strlen.de>
On Thu, Aug 03, 2023 at 05:26:49PM +0200, Florian Westphal wrote:
> If we try to emit an icmp error in response to a nonliner skb, we get
>
> BUG: KASAN: slab-out-of-bounds in ip_compute_csum+0x134/0x220
> Read of size 4 at addr ffff88811c50db00 by task iperf3/1691
> CPU: 2 PID: 1691 Comm: iperf3 Not tainted 6.5.0-rc3+ #309
> [..]
> kasan_report+0x105/0x140
> ip_compute_csum+0x134/0x220
> iptunnel_pmtud_build_icmp+0x554/0x1020
> skb_tunnel_check_pmtu+0x513/0xb80
> vxlan_xmit_one+0x139e/0x2ef0
> vxlan_xmit+0x1867/0x2760
> dev_hard_start_xmit+0x1ee/0x4f0
> br_dev_queue_push_xmit+0x4d1/0x660
> [..]
>
> ip_compute_csum() cannot deal with nonlinear skbs, so avoid it.
> After this change, splat is gone and iperf3 is no longer stuck.
Hi Florian,
I wonder if there are other cases lurking elsewhere.
Did you happen to take a look at that?
> Fixes: 4cb47a8644cc ("tunnels: PMTU discovery support for directly bridged IP packets")
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> net/ipv4/ip_tunnel_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
> index 92c02c886fe7..586b1b3e35b8 100644
> --- a/net/ipv4/ip_tunnel_core.c
> +++ b/net/ipv4/ip_tunnel_core.c
> @@ -224,7 +224,7 @@ static int iptunnel_pmtud_build_icmp(struct sk_buff *skb, int mtu)
> .un.frag.__unused = 0,
> .un.frag.mtu = htons(mtu),
> };
> - icmph->checksum = ip_compute_csum(icmph, len);
> + icmph->checksum = csum_fold(skb_checksum(skb, 0, len, 0));
> skb_reset_transport_header(skb);
>
> niph = skb_push(skb, sizeof(*niph));
> --
> 2.41.0
>
>
next prev parent reply other threads:[~2023-08-05 7:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 15:26 [PATCH net 0/2] tunnels: fix ipv4 pmtu icmp checksum Florian Westphal
2023-08-03 15:26 ` [PATCH net 1/2] tunnels: fix kasan splat when generating ipv4 pmtu error Florian Westphal
2023-08-05 7:07 ` Simon Horman [this message]
2023-08-03 15:26 ` [PATCH net 2/2] selftests: net: test vxlan pmtu exceptions with tcp Florian Westphal
2023-08-05 1:30 ` [PATCH net 0/2] tunnels: fix ipv4 pmtu icmp checksum 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=ZM31Mnl3yhYLMouc@vergenet.net \
--to=horms@kernel.org \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sbrivio@redhat.com \
--cc=shuah@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 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).