Netdev List
 help / color / mirror / Atom feed
From: Kuniyuki Iwashima <kuniyu@google.com>
To: Hungyu Lin <dennylin0707@gmail.com>
Cc: edumazet@kernel.org, ncardwell@google.com, davem@davemloft.net,
	 dsahern@kernel.org, kuba@kernel.org, pabeni@redhat.com,
	horms@kernel.org,  0x7f454c46@gmail.com, fruggeri@arista.com,
	noureddine@arista.com,  netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH net] net/tcp-ao: fix reset key lookup for IPv4 segments on IPv6 listeners
Date: Sat, 21 Nov 2026 18:20:47 +0000	[thread overview]
Message-ID: <awHetU_All3Iydgf@google.com> (raw)
In-Reply-To: <20261117215554.68071-1-dennylin0707@gmail.com>

On Tue, 17 Nov 2026 21:55:54 +0000, Hungyu Lin wrote:
> tcp_ao_prepare_reset() looks up the key for a reset that is sent on
> behalf of a listener by the address of the peer. It takes that address
> from the IPv6 header whenever the listener is an AF_INET6 socket, also
> when the segment is an IPv4 one that arrived on a dual-stack listener.
> The address is then read from the middle of the IPv4 header, the key of
> the peer is not found and the reset is not sent.
> 
> The v4-mapped check that follows does not help: it looks at
> sk->sk_v6_daddr, which is the unspecified address for a listener, and
> it runs after the address has been picked.
> 
> Use the protocol of the segment to tell the family, like
> tcp_v6_do_rcv() does.
> 
> Fixes: 06b22ef29591 ("net/tcp: Wire TCP-AO to request sockets")
> Cc: stable@vger.kernel.org
> Signed-off-by: Hungyu Lin <dennylin0707@gmail.com>
> ---
>  net/ipv4/tcp_ao.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c
> index bb7bbc20ba3f..656dbf805cfc 100644
> --- a/net/ipv4/tcp_ao.c
> +++ b/net/ipv4/tcp_ao.c
> @@ -813,14 +813,12 @@ int tcp_ao_prepare_reset(const struct sock *sk, struct sk_buff *skb,
>  			sisn = th->seq;
>  			disn = 0;
>  		}
> +		if (skb->protocol == htons(ETH_P_IP))
> +			family = AF_INET;
>  		if (IS_ENABLED(CONFIG_IPV6) && family == AF_INET6)
>  			addr = (union tcp_md5_addr *)&ipv6_hdr(skb)->saddr;
>  		else
>  			addr = (union tcp_md5_addr *)&ip_hdr(skb)->saddr;
> -#if IS_ENABLED(CONFIG_IPV6)
> -		if (family == AF_INET6 && ipv6_addr_v4mapped(&sk->sk_v6_daddr))
> -			family = AF_INET;
> -#endif

No need to read sk->sk_family.

union tcp_ao_addr *addr;
unsigned int family;
__be32 disn, sisn;
...
if (IS_ENABLED(CONFIG_IPV6) && skb->protocol == htons(ETH_P_IPV6)) {
	family = AF_INET6;
	addr = (union tcp_md5_addr *)&ipv6_hdr(skb)->saddr;
} else {
	family = AF_INET;
	addr = (union tcp_md5_addr *)&ip_hdr(skb)->saddr;
}

      parent reply	other threads:[~2026-11-21 18:20 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 21:55 [PATCH net] net/tcp-ao: fix reset key lookup for IPv4 segments on IPv6 listeners Hungyu Lin
2026-11-17 21:58 ` netdev-bot+sinfo
2026-11-21 18:20 ` Kuniyuki Iwashima [this message]

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=awHetU_All3Iydgf@google.com \
    --to=kuniyu@google.com \
    --cc=0x7f454c46@gmail.com \
    --cc=davem@davemloft.net \
    --cc=dennylin0707@gmail.com \
    --cc=dsahern@kernel.org \
    --cc=edumazet@kernel.org \
    --cc=fruggeri@arista.com \
    --cc=horms@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ncardwell@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=noureddine@arista.com \
    --cc=pabeni@redhat.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