mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: netdev-bot+sashiko@kernel.org
To: toddfreed@meta.com
Cc: netdev@vger.kernel.org, davem@davemloft.net,
	andrew+netdev@lunn.ch, bjorn@kernel.org, borisp@nvidia.com,
	cratiu@nvidia.com, daniel.zahka@gmail.com, dsahern@kernel.org,
	dtatulea@nvidia.com, edumazet@kernel.org, idosch@nvidia.com,
	kuba@kernel.org, john.fastabend@gmail.com, leon@kernel.org,
	linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
	linux-rdma@vger.kernel.org, mbloch@nvidia.com, pabeni@redhat.com,
	raeds@nvidia.com, rrameshbabu@nvidia.com, sd@queasysnail.net,
	saeedm@nvidia.com, shuah@kernel.org, horms@kernel.org,
	tariqt@nvidia.com, weiwan@google.com,
	willemdebruijn.kernel@gmail.com, stable@vger.kernel.org
Subject: Re: [PATCH net v6 4/8] ipv4: icmp: don't quote decrypted payload in icmp errors
Date: Sat, 21 Nov 2026 21:17:40 +0000	[thread overview]
Message-ID: <179529586053.3135.7106623626318776669@kernel.org> (raw)
In-Reply-To: <20261117203137.804424-5-toddfreed@meta.com>

Thank you for your contribution! Sashiko AI review found 1 potential
issue(s) to consider.

Critical: 0 · High: 0 · Medium: 1 · Low: 0

If you believe none of the issues are legitimate, please reply to each
issue of Medium severity or higher and explain why the AI is wrong.
If any of them are legitimate and you plan to respin, please let patchwork
know by including "pw-bot: cr" as a separate line at the end of your reply
(one such reply per series is enough).

- [Medium] The patch blocks decrypted-payload quoting only in
  __icmp_send() (net/ipv4/icmp.c).

--

ipv4: icmp: don't quote decrypted payload in icmp errors

This patch makes __icmp_send() skip the error when the invoking skb was
decrypted by the device. Locally originated skbs are the exception: if the
error is routed to a local address, it is still sent. The netdev and bridge
nft reject paths are left to a separate nf-next patch.

Closes: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20261023234640.1459291-1-toddfreed%40meta.com

> diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
> index 90c0e22c29bea..e11008aa4cecd 100644
> --- a/net/ipv4/icmp.c
> +++ b/net/ipv4/icmp.c
> @@ -979,6 +979,18 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info,
>  	if (rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))
>  		goto ende;
>
> +	/* Don't send parts of a decrypted skb onto the network. A received skb
> +	 * was decrypted by the device, and the transport header may have been
> +	 * encrypted. The different offloads can't be distinguished in all cases
> +	 * so simply don't send the error.
> +	 *
> +	 * A locally originated skb to be encrypted may be quoted if its source
> +	 * address (target of the error) is local.
> +	 */
> +	if (unlikely(skb_is_decrypted(skb_in)) &&
> +	    (skb_in->skb_iif || !(rt->rt_flags & RTCF_LOCAL)))
> +		goto ende;

[Severity: Medium]
This check only covers ICMP errors sent through icmp_send(). Can a
decrypted payload still be quoted in cleartext by the other IPv4
unreachable builder?

nf_reject_skb_v4_unreach() in net/ipv4/netfilter/nf_reject_ipv4.c is
unchanged by this series and has no skb_is_decrypted() check:

net/ipv4/netfilter/nf_reject_ipv4.c:nf_reject_skb_v4_unreach() {
    ...
	len = min_t(unsigned int, 536, oldskb->len);
    ...
	nskb = alloc_skb(sizeof(struct iphdr) + sizeof(struct icmphdr) +
			 LL_MAX_HEADER + len, GFP_ATOMIC);
    ...
	skb_put_data(nskb, skb_network_header(oldskb), len);
    ...
}

It is called from nft_reject_netdev_send_v4_unreach() and
nft_reject_br_send_v4_unreach(). The nskb comes from a fresh alloc_skb(),
so its decrypted bit is 0, and it goes out through dev_queue_xmit() or
br_forward().

With a netdev or bridge family reject rule matching device-decrypted
traffic, this would still send up to about 508 bytes of kTLS payload, or
the PSP-covered TCP header and payload, unencrypted.

nf_reject_skb_v6_unreach() in net/ipv6/netfilter/nf_reject_ipv6.c has the
same gap, with a quote of up to 1220 bytes. The icmp6_send() side is
handled by the later "ipv6: icmpv6: don't quote decrypted payload in
icmpv6 errors" patch in this series.

The commit message says:

    nft reject in the netdev and bridge families builds its own
    error (nf_reject_skb_v4_unreach()); a separate nf-next patch applies the
    same rule there.

This patch carries Fixes: 784abe24c903 and Cc: stable. A stable backport
would then make an inet family reject of a decrypted packet send nothing.
A netdev or bridge family reject of the same packet would still send
plaintext.

Should the netfilter builders be fixed in this same series, or through
nf/net with the same Fixes: and Cc: stable tags, rather than nf-next?

> +
>  	/* peer icmp_ratelimit */
>  	if (!icmpv4_xrlim_allow(net, rt, &fl4, type, code, apply_ratelimit))
>  		goto ende;

-- 
Sashiko AI review · https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20261117203137.804424-1-toddfreed%40meta.com

  reply	other threads:[~2026-11-21 21:17 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 20:31 [PATCH net v6 0/8] psp, tls: don't send offloaded contents in cleartext Todd Freed
2026-11-17 20:31 ` [PATCH net v6 1/8] net/mlx5e: ring the tx doorbell when an accel offload drops a packet Todd Freed
2026-11-18 14:08   ` Dragos Tatulea
2026-11-21 21:17   ` netdev-bot+sashiko
2026-11-17 20:31 ` [PATCH net v6 2/8] psp: don't encapsulate ipv6 packets with extension headers Todd Freed
2026-11-17 20:31 ` [PATCH net v6 3/8] net: don't fragment decrypted skbs Todd Freed
2026-11-21 21:17   ` netdev-bot+sashiko
2026-11-17 20:31 ` [PATCH net v6 4/8] ipv4: icmp: don't quote decrypted payload in icmp errors Todd Freed
2026-11-21 21:17   ` netdev-bot+sashiko [this message]
2026-11-17 20:31 ` [PATCH net v6 5/8] ipv6: icmpv6: don't quote decrypted payload in icmpv6 errors Todd Freed
2026-11-21 21:17   ` netdev-bot+sashiko
2026-11-17 20:31 ` [PATCH net v6 6/8] selftests: drv-net: psp: test ipv6 tcp socket with extension headers Todd Freed
2026-11-17 20:31 ` [PATCH net v6 7/8] selftests: drv-net: psp: test that ipv4 psp packets aren't fragmented Todd Freed
2026-11-17 20:31 ` [PATCH net v6 8/8] net/mlx5e: psp: tso: replace only the length in checksum seed Todd Freed
2026-11-18 14:24   ` Dragos Tatulea
2026-11-20 17:17     ` Todd Bert Freed

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=179529586053.3135.7106623626318776669@kernel.org \
    --to=netdev-bot+sashiko@kernel.org \
    --cc=andrew+netdev@lunn.ch \
    --cc=bjorn@kernel.org \
    --cc=borisp@nvidia.com \
    --cc=cratiu@nvidia.com \
    --cc=daniel.zahka@gmail.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=dtatulea@nvidia.com \
    --cc=edumazet@kernel.org \
    --cc=horms@kernel.org \
    --cc=idosch@nvidia.com \
    --cc=john.fastabend@gmail.com \
    --cc=kuba@kernel.org \
    --cc=leon@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=mbloch@nvidia.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=raeds@nvidia.com \
    --cc=rrameshbabu@nvidia.com \
    --cc=saeedm@nvidia.com \
    --cc=sd@queasysnail.net \
    --cc=shuah@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tariqt@nvidia.com \
    --cc=toddfreed@meta.com \
    --cc=weiwan@google.com \
    --cc=willemdebruijn.kernel@gmail.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

all inboxes | Powered by JetHome®