1 files changed, 38 insertions, 34 deletions

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 666cf364df86..a3a697f5ffba 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -97,6 +97,7 @@
 #include <net/route.h>
 #include <net/sock.h>
 #include <net/checksum.h>
+#include <net/inet_common.h>
 #include <linux/netfilter_ipv4.h>
 #ifdef CONFIG_IP_MROUTE
 #include <linux/mroute.h>
@@ -369,7 +370,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, unsigned int mtu)
         pip->saddr    = fl4.saddr;
         pip->protocol = IPPROTO_IGMP;
         pip->tot_len  = 0;      /* filled in later */
-        ip_select_ident(skb, NULL);
+        ip_select_ident(net, skb, NULL);
         ((u8 *)&pip[1])[0] = IPOPT_RA;
         ((u8 *)&pip[1])[1] = 4;
         ((u8 *)&pip[1])[2] = 0;
@@ -691,7 +692,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
         hlen = LL_RESERVED_SPACE(dev);
         tlen = dev->needed_tailroom;
         skb = alloc_skb(IGMP_SIZE + hlen + tlen, GFP_ATOMIC);
-        if (skb == NULL) {
+        if (!skb) {
                 ip_rt_put(rt);
                 return -1;
         }
@@ -713,7 +714,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
         iph->daddr    = dst;
         iph->saddr    = fl4.saddr;
         iph->protocol = IPPROTO_IGMP;
-        ip_select_ident(skb, NULL);
+        ip_select_ident(net, skb, NULL);
         ((u8 *)&iph[1])[0] = IPOPT_RA;
         ((u8 *)&iph[1])[1] = 4;
         ((u8 *)&iph[1])[2] = 0;
@@ -980,7 +981,7 @@ int igmp_rcv(struct sk_buff *skb)
         int len = skb->len;
         bool dropped = true;
 
-        if (in_dev == NULL)
+        if (!in_dev)
                 goto drop;
 
         if (!pskb_may_pull(skb, sizeof(struct igmphdr)))
@@ -1849,30 +1850,28 @@ static void ip_mc_clear_src(struct ip_mc_list *pmc)
         pmc->sfcount[MCAST_EXCLUDE] = 1;
 }
 
-
-/*
- * Join a multicast group
+/* Join a multicast group
  */
-int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
+
+int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr)
 {
-        int err;
         __be32 addr = imr->imr_multiaddr.s_addr;
-        struct ip_mc_socklist *iml = NULL, *i;
+        struct ip_mc_socklist *iml, *i;
         struct in_device *in_dev;
         struct inet_sock *inet = inet_sk(sk);
         struct net *net = sock_net(sk);
         int ifindex;
         int count = 0;
+        int err;
+
+        ASSERT_RTNL();
 
         if (!ipv4_is_multicast(addr))
                 return -EINVAL;
 
-        rtnl_lock();
-
         in_dev = ip_mc_find_dev(net, imr);
 
         if (!in_dev) {
-                iml = NULL;
                 err = -ENODEV;
                 goto done;
         }
@@ -1889,7 +1888,7 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
         if (count >= sysctl_igmp_max_memberships)
                 goto done;
         iml = sock_kmalloc(sk, sizeof(*iml), GFP_KERNEL);
-        if (iml == NULL)
+        if (!iml)
                 goto done;
 
         memcpy(&iml->multi, imr, sizeof(*imr));
@@ -1900,7 +1899,6 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
         ip_mc_inc_group(in_dev, addr);
         err = 0;
 done:
-        rtnl_unlock();
         return err;
 }
 EXPORT_SYMBOL(ip_mc_join_group);
@@ -1911,7 +1909,7 @@ static int ip_mc_leave_src(struct sock *sk, struct ip_mc_socklist *iml,
         struct ip_sf_socklist *psf = rtnl_dereference(iml->sflist);
         int err;
 
-        if (psf == NULL) {
+        if (!psf) {
                 /* any-source empty exclude case */
                 return ip_mc_del_src(in_dev, &iml->multi.imr_multiaddr.s_addr,
                         iml->sfmode, 0, NULL, 0);
@@ -1925,10 +1923,6 @@ static int ip_mc_leave_src(struct sock *sk, struct ip_mc_socklist *iml,
         return err;
 }
 
-/*
- *      Ask a socket to leave a group.
- */
-
 int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
 {
         struct inet_sock *inet = inet_sk(sk);
@@ -1940,7 +1934,8 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
         u32 ifindex;
         int ret = -EADDRNOTAVAIL;
 
-        rtnl_lock();
+        ASSERT_RTNL();
+
         in_dev = ip_mc_find_dev(net, imr);
         if (!in_dev) {
                 ret = -ENODEV;
@@ -1964,14 +1959,13 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
                 *imlp = iml->next_rcu;
 
                 ip_mc_dec_group(in_dev, group);
-                rtnl_unlock();
+
                 /* decrease mem now to avoid the memleak warning */
                 atomic_sub(sizeof(*iml), &sk->sk_omem_alloc);
                 kfree_rcu(iml, rcu);
                 return 0;
         }
 out:
-        rtnl_unlock();
         return ret;
 }
 EXPORT_SYMBOL(ip_mc_leave_group);
@@ -1993,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;
@@ -2107,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;
 }
 
@@ -2131,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;
@@ -2193,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;
@@ -2368,7 +2360,7 @@ void ip_mc_drop_socket(struct sock *sk)
         struct ip_mc_socklist *iml;
         struct net *net = sock_net(sk);
 
-        if (inet->mc_list == NULL)
+        if (!inet->mc_list)
                 return;
 
         rtnl_lock();
@@ -2378,7 +2370,7 @@ void ip_mc_drop_socket(struct sock *sk)
                 inet->mc_list = iml->next_rcu;
                 in_dev = inetdev_by_index(net, iml->multi.imr_ifindex);
                 (void) ip_mc_leave_src(sk, iml, in_dev);
-                if (in_dev != NULL)
+                if (in_dev)
                         ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr);
                 /* decrease mem now to avoid the memleak warning */
                 atomic_sub(sizeof(*iml), &sk->sk_omem_alloc);
@@ -2595,13 +2587,13 @@ static inline struct ip_sf_list *igmp_mcf_get_first(struct seq_file *seq)
         for_each_netdev_rcu(net, state->dev) {
                 struct in_device *idev;
                 idev = __in_dev_get_rcu(state->dev);
-                if (unlikely(idev == NULL))
+                if (unlikely(!idev))
                         continue;
                 im = rcu_dereference(idev->mc_list);
-                if (likely(im != NULL)) {
+                if (likely(im)) {
                         spin_lock_bh(&im->lock);
                         psf = im->sources;
-                        if (likely(psf != NULL)) {
+                        if (likely(psf)) {
                                 state->im = im;
                                 state->idev = idev;
                                 break;
@@ -2671,7 +2663,7 @@ static void igmp_mcf_seq_stop(struct seq_file *seq, void *v)
         __releases(rcu)
 {
         struct igmp_mcf_iter_state *state = igmp_mcf_seq_private(seq);
-        if (likely(state->im != NULL)) {
+        if (likely(state->im)) {
                 spin_unlock_bh(&state->im->lock);
                 state->im = NULL;
         }
@@ -2724,6 +2716,7 @@ static const struct file_operations igmp_mcf_seq_fops = {
 static int __net_init igmp_net_init(struct net *net)
 {
         struct proc_dir_entry *pde;
+        int err;
 
         pde = proc_create("igmp", S_IRUGO, net->proc_net, &igmp_mc_seq_fops);
         if (!pde)
@@ -2732,8 +2725,18 @@ static int __net_init igmp_net_init(struct net *net)
                           &igmp_mcf_seq_fops);
         if (!pde)
                 goto out_mcfilter;
+        err = inet_ctl_sock_create(&net->ipv4.mc_autojoin_sk, AF_INET,
+                                   SOCK_DGRAM, 0, net);
+        if (err < 0) {
+                pr_err("Failed to initialize the IGMP autojoin socket (err %d)\n",
+                       err);
+                goto out_sock;
+        }
+
         return 0;
 
+out_sock:
+        remove_proc_entry("mcfilter", net->proc_net);
 out_mcfilter:
         remove_proc_entry("igmp", net->proc_net);
 out_igmp:
@@ -2744,6 +2747,7 @@ static void __net_exit igmp_net_exit(struct net *net)
 {
         remove_proc_entry("mcfilter", net->proc_net);
         remove_proc_entry("igmp", net->proc_net);
+        inet_ctl_sock_destroy(net->ipv4.mc_autojoin_sk);
 }
 
 static struct pernet_operations igmp_net_ops = {