net_cls_act: Make act_simple use of netlink policy.

[safe/jmp/linux-2.6] / net / ipv4 / igmp.c

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index d3d5906..6250f42 100644 (file)
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -130,12 +130,12 @@
  */
 
 #define IGMP_V1_SEEN(in_dev) \
-       (IPV4_DEVCONF_ALL(in_dev->dev->nd_net, FORCE_IGMP_VERSION) == 1 || \
+       (IPV4_DEVCONF_ALL(dev_net(in_dev->dev), FORCE_IGMP_VERSION) == 1 || \
         IN_DEV_CONF_GET((in_dev), FORCE_IGMP_VERSION) == 1 || \
         ((in_dev)->mr_v1_seen && \
          time_before(jiffies, (in_dev)->mr_v1_seen)))
 #define IGMP_V2_SEEN(in_dev) \
-       (IPV4_DEVCONF_ALL(in_dev->dev->nd_net, FORCE_IGMP_VERSION) == 2 || \
+       (IPV4_DEVCONF_ALL(dev_net(in_dev->dev), FORCE_IGMP_VERSION) == 2 || \
         IN_DEV_CONF_GET((in_dev), FORCE_IGMP_VERSION) == 2 || \
         ((in_dev)->mr_v2_seen && \
          time_before(jiffies, (in_dev)->mr_v2_seen)))
@@ -301,7 +301,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
                                    .nl_u = { .ip4_u = {
                                    .daddr = IGMPV3_ALL_MCR } },
                                    .proto = IPPROTO_IGMP };
-               if (ip_route_output_key(&rt, &fl)) {
+               if (ip_route_output_key(&init_net, &rt, &fl)) {
                        kfree_skb(skb);
                        return NULL;
                }
@@ -645,7 +645,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
                struct flowi fl = { .oif = dev->ifindex,
                                    .nl_u = { .ip4_u = { .daddr = dst } },
                                    .proto = IPPROTO_IGMP };
-               if (ip_route_output_key(&rt, &fl))
+               if (ip_route_output_key(&init_net, &rt, &fl))
                        return -1;
        }
        if (rt->rt_src == 0) {
@@ -922,13 +922,11 @@ int igmp_rcv(struct sk_buff *skb)
        struct in_device *in_dev = in_dev_get(skb->dev);
        int len = skb->len;
 
-       if (in_dev==NULL) {
-               kfree_skb(skb);
-               return 0;
-       }
+       if (in_dev == NULL)
+               goto drop;
 
        if (!pskb_may_pull(skb, sizeof(struct igmphdr)))
-               goto drop;
+               goto drop_ref;
 
        switch (skb->ip_summed) {
        case CHECKSUM_COMPLETE:
@@ -938,7 +936,7 @@ int igmp_rcv(struct sk_buff *skb)
        case CHECKSUM_NONE:
                skb->csum = 0;
                if (__skb_checksum_complete(skb))
-                       goto drop;
+                       goto drop_ref;
        }
 
        ih = igmp_hdr(skb);
@@ -950,7 +948,7 @@ int igmp_rcv(struct sk_buff *skb)
        case IGMPV2_HOST_MEMBERSHIP_REPORT:
        case IGMPV3_HOST_MEMBERSHIP_REPORT:
                /* Is it our report looped back? */
-               if (((struct rtable*)skb->dst)->fl.iif == 0)
+               if (skb->rtable->fl.iif == 0)
                        break;
                /* don't rely on MC router hearing unicast reports */
                if (skb->pkt_type == PACKET_MULTICAST ||
@@ -972,8 +970,9 @@ int igmp_rcv(struct sk_buff *skb)
                break;
        }
 
-drop:
+drop_ref:
        in_dev_put(in_dev);
+drop:
        kfree_skb(skb);
        return 0;
 }
@@ -1199,6 +1198,9 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
 
        ASSERT_RTNL();
 
+       if (dev_net(in_dev->dev) != &init_net)
+               return;
+
        for (im=in_dev->mc_list; im; im=im->next) {
                if (im->multiaddr == addr) {
                        im->users++;
@@ -1278,6 +1280,9 @@ void ip_mc_dec_group(struct in_device *in_dev, __be32 addr)
 
        ASSERT_RTNL();
 
+       if (dev_net(in_dev->dev) != &init_net)
+               return;
+
        for (ip=&in_dev->mc_list; (i=*ip)!=NULL; ip=&i->next) {
                if (i->multiaddr==addr) {
                        if (--i->users == 0) {
@@ -1305,6 +1310,9 @@ void ip_mc_down(struct in_device *in_dev)
 
        ASSERT_RTNL();
 
+       if (dev_net(in_dev->dev) != &init_net)
+               return;
+
        for (i=in_dev->mc_list; i; i=i->next)
                igmp_group_dropped(i);
 
@@ -1325,6 +1333,9 @@ void ip_mc_init_dev(struct in_device *in_dev)
 {
        ASSERT_RTNL();
 
+       if (dev_net(in_dev->dev) != &init_net)
+               return;
+
        in_dev->mc_tomb = NULL;
 #ifdef CONFIG_IP_MULTICAST
        in_dev->mr_gq_running = 0;
@@ -1348,6 +1359,9 @@ void ip_mc_up(struct in_device *in_dev)
 
        ASSERT_RTNL();
 
+       if (dev_net(in_dev->dev) != &init_net)
+               return;
+
        ip_mc_inc_group(in_dev, IGMP_ALL_HOSTS);
 
        for (i=in_dev->mc_list; i; i=i->next)
@@ -1364,6 +1378,9 @@ void ip_mc_destroy_dev(struct in_device *in_dev)
 
        ASSERT_RTNL();
 
+       if (dev_net(in_dev->dev) != &init_net)
+               return;
+
        /* Deactivate timers */
        ip_mc_down(in_dev);
 
@@ -1389,19 +1406,19 @@ static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr)
        struct in_device *idev = NULL;
 
        if (imr->imr_ifindex) {
-               idev = inetdev_by_index(imr->imr_ifindex);
+               idev = inetdev_by_index(&init_net, imr->imr_ifindex);
                if (idev)
                        __in_dev_put(idev);
                return idev;
        }
        if (imr->imr_address.s_addr) {
-               dev = ip_dev_find(imr->imr_address.s_addr);
+               dev = ip_dev_find(&init_net, imr->imr_address.s_addr);
                if (!dev)
                        return NULL;
                dev_put(dev);
        }
 
-       if (!dev && !ip_route_output_key(&rt, &fl)) {
+       if (!dev && !ip_route_output_key(&init_net, &rt, &fl)) {
                dev = rt->u.dst.dev;
                ip_rt_put(rt);
        }
@@ -1742,9 +1759,12 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
        int ifindex;
        int count = 0;
 
-       if (!MULTICAST(addr))
+       if (!ipv4_is_multicast(addr))
                return -EINVAL;
 
+       if (sock_net(sk) != &init_net)
+               return -EPROTONOSUPPORT;
+
        rtnl_lock();
 
        in_dev = ip_mc_find_dev(imr);
@@ -1813,6 +1833,9 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
        u32 ifindex;
        int ret = -EADDRNOTAVAIL;
 
+       if (sock_net(sk) != &init_net)
+               return -EPROTONOSUPPORT;
+
        rtnl_lock();
        in_dev = ip_mc_find_dev(imr);
        ifindex = imr->imr_ifindex;
@@ -1855,9 +1878,12 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
        int leavegroup = 0;
        int i, j, rv;
 
-       if (!MULTICAST(addr))
+       if (!ipv4_is_multicast(addr))
                return -EINVAL;
 
+       if (sock_net(sk) != &init_net)
+               return -EPROTONOSUPPORT;
+
        rtnl_lock();
 
        imr.imr_multiaddr.s_addr = mreqs->imr_multiaddr;
@@ -1985,12 +2011,15 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
        struct ip_sf_socklist *newpsl, *psl;
        int leavegroup = 0;
 
-       if (!MULTICAST(addr))
+       if (!ipv4_is_multicast(addr))
                return -EINVAL;
        if (msf->imsf_fmode != MCAST_INCLUDE &&
            msf->imsf_fmode != MCAST_EXCLUDE)
                return -EINVAL;
 
+       if (sock_net(sk) != &init_net)
+               return -EPROTONOSUPPORT;
+
        rtnl_lock();
 
        imr.imr_multiaddr.s_addr = msf->imsf_multiaddr;
@@ -2068,9 +2097,12 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
        struct inet_sock *inet = inet_sk(sk);
        struct ip_sf_socklist *psl;
 
-       if (!MULTICAST(addr))
+       if (!ipv4_is_multicast(addr))
                return -EINVAL;
 
+       if (sock_net(sk) != &init_net)
+               return -EPROTONOSUPPORT;
+
        rtnl_lock();
 
        imr.imr_multiaddr.s_addr = msf->imsf_multiaddr;
@@ -2130,9 +2162,12 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,
        if (psin->sin_family != AF_INET)
                return -EINVAL;
        addr = psin->sin_addr.s_addr;
-       if (!MULTICAST(addr))
+       if (!ipv4_is_multicast(addr))
                return -EINVAL;
 
+       if (sock_net(sk) != &init_net)
+               return -EPROTONOSUPPORT;
+
        rtnl_lock();
 
        err = -EADDRNOTAVAIL;
@@ -2180,7 +2215,7 @@ int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr, int dif)
        struct ip_sf_socklist *psl;
        int i;
 
-       if (!MULTICAST(loc_addr))
+       if (!ipv4_is_multicast(loc_addr))
                return 1;
 
        for (pmc=inet->mc_list; pmc; pmc=pmc->next) {
@@ -2217,12 +2252,15 @@ void ip_mc_drop_socket(struct sock *sk)
        if (inet->mc_list == NULL)
                return;
 
+       if (sock_net(sk) != &init_net)
+               return;
+
        rtnl_lock();
        while ((iml = inet->mc_list) != NULL) {
                struct in_device *in_dev;
                inet->mc_list = iml->next;
 
-               in_dev = inetdev_by_index(iml->multi.imr_ifindex);
+               in_dev = inetdev_by_index(&init_net, iml->multi.imr_ifindex);
                (void) ip_mc_leave_src(sk, iml, in_dev);
                if (in_dev != NULL) {
                        ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr);
@@ -2329,6 +2367,7 @@ static struct ip_mc_list *igmp_mc_get_idx(struct seq_file *seq, loff_t pos)
 }
 
 static void *igmp_mc_seq_start(struct seq_file *seq, loff_t *pos)
+       __acquires(dev_base_lock)
 {
        read_lock(&dev_base_lock);
        return *pos ? igmp_mc_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
@@ -2346,6 +2385,7 @@ static void *igmp_mc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 }
 
 static void igmp_mc_seq_stop(struct seq_file *seq, void *v)
+       __releases(dev_base_lock)
 {
        struct igmp_mc_iter_state *state = igmp_mc_seq_private(seq);
        if (likely(state->in_dev != NULL)) {