Skip to contentSkip to conversation

ip6mr: remove stray rcu_read_unlock() from ip6_mr_forward()

PATCH Applied Eric Dumazet 3 participants 3 messages Jul 25, 2022 – Jul 27, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ip6mr: remove stray rcu_read_unlock() from ip6_mr_forward()

From: Eric Dumazet <[email protected]>

One rcu_read_unlock() should have been removed in blamed commit.

Fixes 9b1c21d898fd ("ip6mr: do not acquire mrt_lock while calling ip6_mr_forward()")
---
 net/ipv6/ip6mr.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
net/ipv6/ip6mr.c +1 -3
index d546fc09d80310f20488a6627bf782c067a80fa6..a9ba41648e36854fe1702a3397a36a366be4c682 100644
@@ -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;
-		}
 	}
 
 	/*
Signature · 1 line
2.37.1.359.gd136c6c3e2-goog
#2 lore raw
In reply to Eric Dumazet
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Quoted 9 lines · On Mon, 25 Jul 2022 13:05:54 -0700 you wrote:

From: Eric Dumazet <[email protected]>

One rcu_read_unlock() should have been removed in blamed commit.

Fixes 9b1c21d898fd ("ip6mr: do not acquire mrt_lock while calling ip6_mr_forward()")

[...]

Here is the summary with links:
- [net-next] ip6mr: remove stray rcu_read_unlock() from ip6_mr_forward()

    https://git.kernel.org/netdev/net-next/c/a7e555d4a184

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html