Netdev List
 help / color / mirror / Atom feed
From: Ralf Lici <ralf@mandelbit.com>
To: netdev-bot+sashiko@kernel.org
Cc: netdev@vger.kernel.org, dsahern@kernel.org, idosch@nvidia.com,
	davem@davemloft.net, edumazet@kernel.org, kuba@kernel.org,
	pabeni@redhat.com, horms@kernel.org, ncardwell@google.com,
	kuniyu@google.com, steffen.klassert@secunet.com,
	herbert@gondor.apana.org.au, fw@strlen.de, sd@queasysnail.net
Subject: Re: [PATCH net-next v2 3/3] ipv6: use the lookup cookie when caching the dst in sockets
Date: Mon, 16 Nov 2026 10:02:15 +0100	[thread overview]
Message-ID: <20261116090215.93209-1-ralf@mandelbit.com> (raw)
In-Reply-To: <179473299346.2199510.11559140714770152951@kernel.org>

On Sun, 15 Nov 2026 08:56:33 +0000, netdev-bot+sashiko@kernel.org wrote:
> > Store the cookie returned by ip6_dst_lookup_flow_cookie instead. Add
> > ip6_dst_store_cookie for this and keep ip6_dst_store for callers that
> > have no lookup cookie.
> >
> > Signed-off-by: Ralf Lici <ralf@mandelbit.com>
>
> [Severity: Low]
> This isn't a bug, but should this have a Fixes: tag and Cc: stable? The
> commit message describes a socket that "keeps sending plaintext" when it
> should be using IPsec.
>
> The patch also calls ip6_dst_lookup_flow_cookie(). That helper comes from
> the previous patch in the series ("ipv6: add ip6_dst_lookup_flow_cookie"),
> which also changes ip6_dst_check() behaviour for nexthop-object dsts. So
> this patch can't be backported on its own. Could the dependency be noted
> for stable?
>

The same historical and target-tree considerations discussed in my reply
to Sashiko's review in patch 1/3 apply here as well. The late cookie
sampling in the socket cache is already present in the initial Git
import. I can clarify that attribution when revising the changelog.

> > diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
> > index 95f936be32c6c..2684f6069a5e1 100644
> > --- a/include/net/ip6_route.h
> > +++ b/include/net/ip6_route.h
>
> [ ... ]
>
> > @@ -266,8 +266,16 @@ static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
> >  #endif
> >  }
> >  
> > +static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
> > +				 bool daddr_set,
> > +				 bool saddr_set)
> > +{
> > +	ip6_dst_store_cookie(sk, dst, rt6_get_cookie(dst_rt6_info(dst)),
> > +			     daddr_set, saddr_set);
> > +}
>
> [Severity: High]
> Is the TCP side of this fix complete? The commit message says this
> "affects TCP and connected UDP sockets alike", but tcp_v6_connect() is
> the only TCP path converted. Other TCPv6 paths still call
> ip6_dst_lookup_flow() and then ip6_dst_store(), so they still read the
> cookie after xfrm_lookup_route() has returned.
>
> Here is inet6_csk_route_socket() in net/ipv6/inet6_connection_sock.c:
>
> 	dst = ip6_dst_lookup_flow(sock_net(sk), sk, fl6, final_p);
>
> 	if (!IS_ERR(dst))
> 		ip6_dst_store(sk, dst, false, false);
>
> inet6_csk_xmit() reaches this whenever __sk_dst_check(sk, np->dst_cookie)
> fails. inet6_csk_update_pmtu() also reaches it through
> tcp_v6_mtu_reduced(), and a remote peer can trigger that path with
> ICMPv6 Packet Too Big.
>
> inet6_sk_rebuild_header() in net/ipv6/af_inet6.c has the same
> lookup/store pair. It is ipv6_specific.rebuild_header, and tcp_connect()
> calls it right after tcp_v6_connect(). Suppose
> ip6_dst_lookup_flow_cookie() saw the generation move and returned cookie
> 0. Then __sk_dst_check() fails immediately, and the lookup is redone
> through the unconverted path inside the same connect() call. The
> retransmit path also reaches inet6_sk_rebuild_header().
>
> tcp_v6_syn_recv_sock() in net/ipv6/tcp_ipv6.c gets its dst from
> inet6_csk_route_req(). That function calls ip6_dst_lookup_flow() without
> capturing a cookie. tcp_v6_syn_recv_sock() then runs
> tcp_create_openreq_child() before it does:
>
> 	ip6_dst_store(newsk, dst, false, false);
>
> So every passively opened IPv6 TCP socket has the same window.
>
> An xfrm policy insertion goes through
> rt_genid_bump_ipv6()->__fib6_flush_trees(), which invalidates every
> cached socket dst. Established sockets therefore re-route through
> inet6_csk_route_socket() right after a policy change.
>
> Suppose another policy is inserted during that re-lookup, which can
> happen when an IKE daemon installs several policies back to back. Can
> the plain route then be cached with the post-insertion serial? If so,
> inet6_csk_xmit() would keep accepting it and send plaintext.
>
> The commit message says ip6_dst_store is kept "for callers that have no
> lookup cookie". Each of these callers does its own ip6_dst_lookup_flow(),
> though, so each could use ip6_dst_lookup_flow_cookie() with
> ip6_dst_store_cookie(). For the passive-open path, inet6_csk_route_req()
> would need to return the cookie.
>
> The kernel-doc of ip6_dst_lookup_flow_cookie() also says "A caller caching
> the dst should use this cookie when validating it with dst_check."
>
> [Severity: Medium]
> Does the same window remain in the SCTP per-transport dst cache?
> sctp_v6_get_dst() in net/sctp/ipv6.c does its route and policy lookup
> through ip6_dst_lookup_flow() and stores the result in t->dst. Only after
> that does it read the cookie:
>
> 	rt = dst_rt6_info(dst);
> 	t->dst_cookie = rt6_get_cookie(rt);
>
> sctp_transport_dst_check() later validates t->dst against that cookie.
> If an xfrm policy insertion restamps fn_sernum between the lookup and
> this read, could an SCTP association over IPv6 keep using the route that
> was found without the policy?
>
> dst_cache_set_ip6() in net/core/dst_cache.c has the same pattern. IPv6
> UDP tunnels and ip6_tunnel use it:
>
> 	dst_cache_per_cpu_dst_set(idst, dst,
> 				  rt6_get_cookie(dst_rt6_info(dst)));
>
> The previous patch in the series describes the problem as affecting all
> "callers that keep a dst in a persistent cache". Should these sites also
> be converted to ip6_dst_lookup_flow_cookie(), or at least mentioned in
> the commit message?
>

Both points concern conversions explicitly deferred in the cover letter.
The same scope discussion in my reply to patch 2/3 applies here: these
paths are follow-up work, pending feedback on the lookup-cookie API and
its incremental introduction.

-- 
Ralf Lici
Mandelbit Srl

      reply	other threads:[~2026-11-16  9:02 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-11  8:22 [PATCH net-next v2 0/3] ipv6: tie the dst cookie to the lookup that returned the dst Ralf Lici
2026-11-11  8:22 ` [PATCH net-next v2 1/3] ipv6: stamp the default route node with a fresh serial on link failure Ralf Lici
2026-11-15  8:56   ` netdev-bot+sashiko
2026-11-16  8:49     ` Ralf Lici
2026-11-11  8:22 ` [PATCH net-next v2 2/3] ipv6: add ip6_dst_lookup_flow_cookie Ralf Lici
2026-11-15  8:56   ` netdev-bot+sashiko
2026-11-16  8:58     ` Ralf Lici
2026-11-11  8:22 ` [PATCH net-next v2 3/3] ipv6: use the lookup cookie when caching the dst in sockets Ralf Lici
2026-11-15  8:56   ` netdev-bot+sashiko
2026-11-16  9:02     ` Ralf Lici [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=20261116090215.93209-1-ralf@mandelbit.com \
    --to=ralf@mandelbit.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=edumazet@kernel.org \
    --cc=fw@strlen.de \
    --cc=herbert@gondor.apana.org.au \
    --cc=horms@kernel.org \
    --cc=idosch@nvidia.com \
    --cc=kuba@kernel.org \
    --cc=kuniyu@google.com \
    --cc=ncardwell@google.com \
    --cc=netdev-bot+sashiko@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=sd@queasysnail.net \
    --cc=steffen.klassert@secunet.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