]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ip6mr: remove stray rcu_read_unlock() from ip6_mr_forward()
authorEric Dumazet <edumazet@google.com>
Mon, 25 Jul 2022 20:05:54 +0000 (13:05 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 27 Jul 2022 02:59:18 +0000 (19:59 -0700)
One rcu_read_unlock() should have been removed in blamed commit.

Fixes: 9b1c21d898fd ("ip6mr: do not acquire mrt_lock while calling ip6_mr_forward()")
Reported-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Link: https://lore.kernel.org/r/20220725200554.2563581-1-eric.dumazet@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv6/ip6mr.c

index d546fc09d80310f20488a6627bf782c067a80fa6..a9ba41648e36854fe1702a3397a36a366be4c682 100644 (file)
@@ -2133,10 +2133,8 @@ static void ip6_mr_forward(struct net *net, struct mr_table *mrt,
                 */
                cache_proxy = mr_mfc_find_any_parent(mrt, vif);
                if (cache_proxy &&
-                   cache_proxy->_c.mfc_un.res.ttls[true_vifi] < 255) {
-                       rcu_read_unlock();
+                   cache_proxy->_c.mfc_un.res.ttls[true_vifi] < 255)
                        goto forward;
-               }
        }
 
        /*