diff options
| author |   Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2015-03-18 14:50:43 -0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-18 22:05:09 -0400 |
| commit | 54ff9ef36bdf84d469a098cbf8e2a103fbc77054 (patch) | |
| tree | 74fb6219d97f44685a80b090888ffd5ea667e01e /include/linux | |
| parent | ipv4,ipv6: grab rtnl before locking the socket (diff) | |
| download | linux-dev-54ff9ef36bdf84d469a098cbf8e2a103fbc77054.tar.xz linux-dev-54ff9ef36bdf84d469a098cbf8e2a103fbc77054.zip | |
ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop}
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>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/igmp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/igmp.h b/include/linux/igmp.h index b5a6470e686c..2c677afeea47 100644 --- a/include/linux/igmp.h +++ b/include/linux/igmp.h @@ -111,9 +111,7 @@ struct ip_mc_list { extern int ip_check_mc_rcu(struct in_device *dev, __be32 mc_addr, __be32 src_addr, u16 proto); extern int igmp_rcv(struct sk_buff *); -extern int __ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr); extern int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr); -extern int __ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr); extern int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr); extern void ip_mc_drop_socket(struct sock *sk); extern int ip_mc_source(int add, int omode, struct sock *sk, |