diff mbox series

[net-next] ip6mr: remove stray rcu_read_unlock() from ip6_mr_forward()

Message ID 20220725200554.2563581-1-eric.dumazet@gmail.com (mailing list archive)
State Accepted
Commit a7e555d4a184d7da72ed6df7d6741dc190b5ca5b
Delegated to: Netdev Maintainers
Headers show
Series [net-next] ip6mr: remove stray rcu_read_unlock() from ip6_mr_forward() | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix success Link
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 3 this patch: 2
netdev/cc_maintainers warning 2 maintainers not CCed: yoshfuji@linux-ipv6.org dsahern@kernel.org
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 3 this patch: 2
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 11 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Eric Dumazet July 25, 2022, 8:05 p.m. UTC 
From: Eric Dumazet <edumazet@google.com>

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>
---
 net/ipv6/ip6mr.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Vladimir Oltean July 25, 2022, 8:36 p.m. UTC | #1 
On Mon, Jul 25, 2022 at 01:05:54PM -0700, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
> 
> 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>
patchwork-bot+netdevbpf@kernel.org July 27, 2022, 3:10 a.m. UTC | #2 
Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 25 Jul 2022 13:05:54 -0700 you wrote:
> From: Eric Dumazet <edumazet@google.com>
> 
> 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>
> 
> [...]

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!
diff mbox series

Patch

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index d546fc09d80310f20488a6627bf782c067a80fa6..a9ba41648e36854fe1702a3397a36a366be4c682 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -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;
-		}
 	}
 
 	/*