xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop}

Browse Source 
in favor of their inner __ ones, which doesn't grab rtnl.

As these functions need to operate on a locked socket, we can't be
grabbing rtnl by then. It's too late and doing so causes reversed
locking.

So this patch:
- move rtnl handling to callers instead while already fixing some
  reversed locking situations, like on vxlan and ipvs code.
- renames __ ones to not have the __ mark:
  __ip_mc_{join,leave}_group -> ip_mc_{join,leave}_group
  __ipv6_sock_mc_{join,drop} -> ipv6_sock_mc_{join,drop}

Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Marcelo Ricardo Leitner
2015-03-18 14:50:43 -03:00
committed by David S. Miller
parent baf606d9c9
commit 54ff9ef36b
11 changed files with 51 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv6/addrconf.c
View File

@@ -2473,9 +2473,9 @@ static int ipv6_mc_config(struct sock *sk, bool join,
lock_sock(sk);
if (join)
ret = __ipv6_sock_mc_join(sk, ifindex, addr);
ret = ipv6_sock_mc_join(sk, ifindex, addr);
else
ret = __ipv6_sock_mc_drop(sk, ifindex, addr);
ret = ipv6_sock_mc_drop(sk, ifindex, addr);
release_sock(sk);
return ret;