net: ipv6: fix dst ref loops in rpl, seg6 and ioam6 lwtunnels

Some lwtunnels have a dst cache for post-transformation dst.
If the packet destination did not change we may end up recording
a reference to the lwtunnel in its own cache, and the lwtunnel
state will never be freed.

Discovered by the ioam6.sh test, kmemleak was recently fixed
to catch per-cpu memory leaks. I'm not sure if rpl and seg6
can actually hit this, but in principle I don't see why not.

Fixes: 8cb3bf8bff3c ("ipv6: ioam: Add support for the ip6ip6 encapsulation")
Fixes: 6c8702c60b88 ("ipv6: sr: add support for SRH encapsulation and injection with lwtunnels")
Fixes: a7a29f9c361f ("net: ipv6: add rpl sr tunnel")
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250130031519.2716843-2-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv6/ioam6_iptunnel.c b/net/ipv6/ioam6_iptunnel.c
index 3936c137a5727cd7e2689d1b6bd48babe6676982..2c383c12a431599fe9740a71d564376c94148b57 100644 (file)
--- a/net/ipv6/ioam6_iptunnel.c
+++ b/net/ipv6/ioam6_iptunnel.c
@@ -410,9 +410,12 @@ do_encap:
                        goto drop;
                }
 
-               local_bh_disable();
-               dst_cache_set_ip6(&ilwt->cache, cache_dst, &fl6.saddr);
-               local_bh_enable();
+               /* cache only if we don't create a dst reference loop */
+               if (dst->lwtstate != cache_dst->lwtstate) {
+                       local_bh_disable();
+                       dst_cache_set_ip6(&ilwt->cache, cache_dst, &fl6.saddr);
+                       local_bh_enable();
+               }
 
                err = skb_cow_head(skb, LL_RESERVED_SPACE(cache_dst->dev));
                if (unlikely(err))

diff --git a/net/ipv6/rpl_iptunnel.c b/net/ipv6/rpl_iptunnel.c
index 9b7d035631154b6fd51544fa1d3b17b7dbd1fc2d..0ac4283acdf20c2f2c10cd0f9ec586a0645c129e 100644 (file)
--- a/net/ipv6/rpl_iptunnel.c
+++ b/net/ipv6/rpl_iptunnel.c
@@ -235,9 +235,12 @@ static int rpl_output(struct net *net, struct sock *sk, struct sk_buff *skb)
                        goto drop;
                }
 
-               local_bh_disable();
-               dst_cache_set_ip6(&rlwt->cache, dst, &fl6.saddr);
-               local_bh_enable();
+               /* cache only if we don't create a dst reference loop */
+               if (orig_dst->lwtstate != dst->lwtstate) {
+                       local_bh_disable();
+                       dst_cache_set_ip6(&rlwt->cache, dst, &fl6.saddr);
+                       local_bh_enable();
+               }
 
                err = skb_cow_head(skb, LL_RESERVED_SPACE(dst->dev));
                if (unlikely(err))

diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c
index eacc4e91b48efd6762d352f1dc10d0e4cdd5748c..33833b2064c072b7f1647cc41392bccbb11eb275 100644 (file)
--- a/net/ipv6/seg6_iptunnel.c
+++ b/net/ipv6/seg6_iptunnel.c
@@ -576,9 +576,12 @@ static int seg6_output_core(struct net *net, struct sock *sk,
                        goto drop;
                }
 
-               local_bh_disable();
-               dst_cache_set_ip6(&slwt->cache, dst, &fl6.saddr);
-               local_bh_enable();
+               /* cache only if we don't create a dst reference loop */
+               if (orig_dst->lwtstate != dst->lwtstate) {
+                       local_bh_disable();
+                       dst_cache_set_ip6(&slwt->cache, dst, &fl6.saddr);
+                       local_bh_enable();
+               }
 
                err = skb_cow_head(skb, LL_RESERVED_SPACE(dst->dev));
                if (unlikely(err))