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>

1 files changed, 15 insertions, 6 deletions

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 5171709199f4..f6a0d54b308a 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -541,9 +541,18 @@ static bool setsockopt_needs_rtnl(int optname)
         switch (optname) {
         case IP_ADD_MEMBERSHIP:
         case IP_ADD_SOURCE_MEMBERSHIP:
+        case IP_BLOCK_SOURCE:
         case IP_DROP_MEMBERSHIP:
+        case IP_DROP_SOURCE_MEMBERSHIP:
+        case IP_MSFILTER:
+        case IP_UNBLOCK_SOURCE:
+        case MCAST_BLOCK_SOURCE:
+        case MCAST_MSFILTER:
         case MCAST_JOIN_GROUP:
+        case MCAST_JOIN_SOURCE_GROUP:
         case MCAST_LEAVE_GROUP:
+        case MCAST_LEAVE_SOURCE_GROUP:
+        case MCAST_UNBLOCK_SOURCE:
                 return true;
         }
         return false;
@@ -861,9 +870,9 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                 }
 
                 if (optname == IP_ADD_MEMBERSHIP)
-                        err = __ip_mc_join_group(sk, &mreq);
+                        err = ip_mc_join_group(sk, &mreq);
                 else
-                        err = __ip_mc_leave_group(sk, &mreq);
+                        err = ip_mc_leave_group(sk, &mreq);
                 break;
         }
         case IP_MSFILTER:
@@ -928,7 +937,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                         mreq.imr_multiaddr.s_addr = mreqs.imr_multiaddr;
                         mreq.imr_address.s_addr = mreqs.imr_interface;
                         mreq.imr_ifindex = 0;
-                        err = __ip_mc_join_group(sk, &mreq);
+                        err = ip_mc_join_group(sk, &mreq);
                         if (err && err != -EADDRINUSE)
                                 break;
                         omode = MCAST_INCLUDE;
@@ -960,9 +969,9 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                 mreq.imr_ifindex = greq.gr_interface;
 
                 if (optname == MCAST_JOIN_GROUP)
-                        err = __ip_mc_join_group(sk, &mreq);
+                        err = ip_mc_join_group(sk, &mreq);
                 else
-                        err = __ip_mc_leave_group(sk, &mreq);
+                        err = ip_mc_leave_group(sk, &mreq);
                 break;
         }
         case MCAST_JOIN_SOURCE_GROUP:
@@ -1005,7 +1014,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                         mreq.imr_multiaddr = psin->sin_addr;
                         mreq.imr_address.s_addr = 0;
                         mreq.imr_ifindex = greqs.gsr_interface;
-                        err = __ip_mc_join_group(sk, &mreq);
+                        err = ip_mc_join_group(sk, &mreq);
                         if (err && err != -EADDRINUSE)
                                 break;
                         greqs.gsr_interface = mreq.imr_ifindex;