8 files changed, 47 insertions, 80 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 375dc71b9a64..975ee5e30c64 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -560,9 +560,9 @@ static int ip_mc_config(struct sock *sk, bool join, const struct in_ifaddr *ifa)
 
         lock_sock(sk);
         if (join)
-                ret = __ip_mc_join_group(sk, &mreq);
+                ret = ip_mc_join_group(sk, &mreq);
         else
-                ret = __ip_mc_leave_group(sk, &mreq);
+                ret = ip_mc_leave_group(sk, &mreq);
         release_sock(sk);
 
         return ret;
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 5cb1ef4ce292..ad3f866085de 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1850,7 +1850,10 @@ static void ip_mc_clear_src(struct ip_mc_list *pmc)
         pmc->sfcount[MCAST_EXCLUDE] = 1;
 }
 
-int __ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr)
+/* Join a multicast group
+ */
+
+int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr)
 {
         __be32 addr = imr->imr_multiaddr.s_addr;
         struct ip_mc_socklist *iml, *i;
@@ -1898,20 +1901,6 @@ int __ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr)
 done:
         return err;
 }
-EXPORT_SYMBOL(__ip_mc_join_group);
-
-/* Join a multicast group
- */
-int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr)
-{
-        int ret;
-
-        rtnl_lock();
-        ret = __ip_mc_join_group(sk, imr);
-        rtnl_unlock();
-
-        return ret;
-}
 EXPORT_SYMBOL(ip_mc_join_group);
 
 static int ip_mc_leave_src(struct sock *sk, struct ip_mc_socklist *iml,
@@ -1934,7 +1923,7 @@ static int ip_mc_leave_src(struct sock *sk, struct ip_mc_socklist *iml,
         return err;
 }
 
-int __ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
+int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
 {
         struct inet_sock *inet = inet_sk(sk);
         struct ip_mc_socklist *iml;
@@ -1979,18 +1968,6 @@ int __ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
 out:
         return ret;
 }
-EXPORT_SYMBOL(__ip_mc_leave_group);
-
-int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
-{
-        int ret;
-
-        rtnl_lock();
-        ret = __ip_mc_leave_group(sk, imr);
-        rtnl_unlock();
-
-        return ret;
-}
 EXPORT_SYMBOL(ip_mc_leave_group);
 
 int ip_mc_source(int add, int omode, struct sock *sk, struct
@@ -2010,7 +1987,7 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
         if (!ipv4_is_multicast(addr))
                 return -EINVAL;
 
-        rtnl_lock();
+        ASSERT_RTNL();
 
         imr.imr_multiaddr.s_addr = mreqs->imr_multiaddr;
         imr.imr_address.s_addr = mreqs->imr_interface;
@@ -2124,9 +2101,8 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
         ip_mc_add_src(in_dev, &mreqs->imr_multiaddr, omode, 1,
                 &mreqs->imr_sourceaddr, 1);
 done:
-        rtnl_unlock();
         if (leavegroup)
-                return ip_mc_leave_group(sk, &imr);
+                err = ip_mc_leave_group(sk, &imr);
         return err;
 }
 
@@ -2148,7 +2124,7 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
             msf->imsf_fmode != MCAST_EXCLUDE)
                 return -EINVAL;
 
-        rtnl_lock();
+        ASSERT_RTNL();
 
         imr.imr_multiaddr.s_addr = msf->imsf_multiaddr;
         imr.imr_address.s_addr = msf->imsf_interface;
@@ -2210,7 +2186,6 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
         pmc->sfmode = msf->imsf_fmode;
         err = 0;
 done:
-        rtnl_unlock();
         if (leavegroup)
                 err = ip_mc_leave_group(sk, &imr);
         return err;
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;
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 88d2cf0cae52..158378e73f0a 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -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;
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index f2b731df8d77..cc5883791bac 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -124,6 +124,11 @@ static bool setsockopt_needs_rtnl(int optname)
         case IPV6_DROP_MEMBERSHIP:
         case MCAST_JOIN_GROUP:
         case MCAST_LEAVE_GROUP:
+        case MCAST_JOIN_SOURCE_GROUP:
+        case MCAST_LEAVE_SOURCE_GROUP:
+        case MCAST_BLOCK_SOURCE:
+        case MCAST_UNBLOCK_SOURCE:
+        case MCAST_MSFILTER:
                 return true;
         }
         return false;
@@ -597,9 +602,9 @@ done:
                         break;
 
                 if (optname == IPV6_ADD_MEMBERSHIP)
-                        retv = __ipv6_sock_mc_join(sk, mreq.ipv6mr_ifindex, &mreq.ipv6mr_multiaddr);
+                        retv = ipv6_sock_mc_join(sk, mreq.ipv6mr_ifindex, &mreq.ipv6mr_multiaddr);
                 else
-                        retv = __ipv6_sock_mc_drop(sk, mreq.ipv6mr_ifindex, &mreq.ipv6mr_multiaddr);
+                        retv = ipv6_sock_mc_drop(sk, mreq.ipv6mr_ifindex, &mreq.ipv6mr_multiaddr);
                 break;
         }
         case IPV6_JOIN_ANYCAST:
@@ -638,11 +643,11 @@ done:
                 }
                 psin6 = (struct sockaddr_in6 *)&greq.gr_group;
                 if (optname == MCAST_JOIN_GROUP)
-                        retv = __ipv6_sock_mc_join(sk, greq.gr_interface,
-                                                   &psin6->sin6_addr);
+                        retv = ipv6_sock_mc_join(sk, greq.gr_interface,
+                                                 &psin6->sin6_addr);
                 else
-                        retv = __ipv6_sock_mc_drop(sk, greq.gr_interface,
-                                                   &psin6->sin6_addr);
+                        retv = ipv6_sock_mc_drop(sk, greq.gr_interface,
+                                                 &psin6->sin6_addr);
                 break;
         }
         case MCAST_JOIN_SOURCE_GROUP:
@@ -674,8 +679,8 @@ done:
                         struct sockaddr_in6 *psin6;
 
                         psin6 = (struct sockaddr_in6 *)&greqs.gsr_group;
-                        retv = __ipv6_sock_mc_join(sk, greqs.gsr_interface,
-                                                   &psin6->sin6_addr);
+                        retv = ipv6_sock_mc_join(sk, greqs.gsr_interface,
+                                                 &psin6->sin6_addr);
                         /* prior join w/ different source is ok */
                         if (retv && retv != -EADDRINUSE)
                                 break;
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 1dd1fedff9f4..cbb66fd3da6d 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -132,7 +132,7 @@ static int unsolicited_report_interval(struct inet6_dev *idev)
         return iv > 0 ? iv : 1;
 }
 
-int __ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
+int ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
 {
         struct net_device *dev = NULL;
         struct ipv6_mc_socklist *mc_lst;
@@ -199,24 +199,12 @@ int __ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *add
 
         return 0;
 }
-EXPORT_SYMBOL(__ipv6_sock_mc_join);
-
-int ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
-{
-        int ret;
-
-        rtnl_lock();
-        ret = __ipv6_sock_mc_join(sk, ifindex, addr);
-        rtnl_unlock();
-
-        return ret;
-}
 EXPORT_SYMBOL(ipv6_sock_mc_join);
 
 /*
  *      socket leave on multicast group
  */
-int __ipv6_sock_mc_drop(struct sock *sk, int ifindex, const struct in6_addr *addr)
+int ipv6_sock_mc_drop(struct sock *sk, int ifindex, const struct in6_addr *addr)
 {
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct ipv6_mc_socklist *mc_lst;
@@ -255,18 +243,6 @@ int __ipv6_sock_mc_drop(struct sock *sk, int ifindex, const struct in6_addr *add
 
         return -EADDRNOTAVAIL;
 }
-EXPORT_SYMBOL(__ipv6_sock_mc_drop);
-
-int ipv6_sock_mc_drop(struct sock *sk, int ifindex, const struct in6_addr *addr)
-{
-        int ret;
-
-        rtnl_lock();
-        ret = __ipv6_sock_mc_drop(sk, ifindex, addr);
-        rtnl_unlock();
-
-        return ret;
-}
 EXPORT_SYMBOL(ipv6_sock_mc_drop);
 
 /* called with rcu_read_lock() */
@@ -460,7 +436,7 @@ done:
         read_unlock_bh(&idev->lock);
         rcu_read_unlock();
         if (leavegroup)
-                return ipv6_sock_mc_drop(sk, pgsr->gsr_interface, group);
+                err = ipv6_sock_mc_drop(sk, pgsr->gsr_interface, group);
         return err;
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 08d95559b6f7..19b9cce6c210 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1405,9 +1405,11 @@ join_mcast_group(struct sock *sk, struct in_addr *addr, char *ifname)
 
         mreq.imr_ifindex = dev->ifindex;
 
+        rtnl_lock();
         lock_sock(sk);
         ret = ip_mc_join_group(sk, &mreq);
         release_sock(sk);
+        rtnl_unlock();
 
         return ret;
 }
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
index fc2fb11a354d..04836dd70c2b 100644
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
@@ -246,11 +246,11 @@ static int enable_mcast(struct udp_bearer *ub, struct udp_media_addr *remote)
                         return 0;
                 mreqn.imr_multiaddr = remote->ipv4;
                 mreqn.imr_ifindex = ub->ifindex;
-                err = __ip_mc_join_group(sk, &mreqn);
+                err = ip_mc_join_group(sk, &mreqn);
         } else {
                 if (!ipv6_addr_is_multicast(&remote->ipv6))
                         return 0;
-                err = __ipv6_sock_mc_join(sk, ub->ifindex, &remote->ipv6);
+                err = ipv6_sock_mc_join(sk, ub->ifindex, &remote->ipv6);
         }
         return err;
 }