raw: use more conventional iterators

[linux-block.git] / net / ipv6 / raw.c

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 3b7cbd522b5483e7cf0d17a3d3533839481515bc..c0f2e34759846562dddba24b4de8970dc4b4db89 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -66,41 +66,27 @@ struct raw_hashinfo raw_v6_hashinfo = {
 };
 EXPORT_SYMBOL_GPL(raw_v6_hashinfo);
 
-struct sock *__raw_v6_lookup(struct net *net, struct sock *sk,
-               unsigned short num, const struct in6_addr *loc_addr,
-               const struct in6_addr *rmt_addr, int dif, int sdif)
+bool raw_v6_match(struct net *net, struct sock *sk, unsigned short num,
+                 const struct in6_addr *loc_addr,
+                 const struct in6_addr *rmt_addr, int dif, int sdif)
 {
-       bool is_multicast = ipv6_addr_is_multicast(loc_addr);
-
-       sk_for_each_from(sk)
-               if (inet_sk(sk)->inet_num == num) {
-
-                       if (!net_eq(sock_net(sk), net))
-                               continue;
-
-                       if (!ipv6_addr_any(&sk->sk_v6_daddr) &&
-                           !ipv6_addr_equal(&sk->sk_v6_daddr, rmt_addr))
-                               continue;
-
-                       if (!raw_sk_bound_dev_eq(net, sk->sk_bound_dev_if,
-                                                dif, sdif))
-                               continue;
-
-                       if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) {
-                               if (ipv6_addr_equal(&sk->sk_v6_rcv_saddr, loc_addr))
-                                       goto found;
-                               if (is_multicast &&
-                                   inet6_mc_check(sk, loc_addr, rmt_addr))
-                                       goto found;
-                               continue;
-                       }
-                       goto found;
-               }
-       sk = NULL;
-found:
-       return sk;
+       if (inet_sk(sk)->inet_num != num ||
+           !net_eq(sock_net(sk), net) ||
+           (!ipv6_addr_any(&sk->sk_v6_daddr) &&
+            !ipv6_addr_equal(&sk->sk_v6_daddr, rmt_addr)) ||
+           !raw_sk_bound_dev_eq(net, sk->sk_bound_dev_if,
+                                dif, sdif))
+               return false;
+
+       if (ipv6_addr_any(&sk->sk_v6_rcv_saddr) ||
+           ipv6_addr_equal(&sk->sk_v6_rcv_saddr, loc_addr) ||
+           (ipv6_addr_is_multicast(loc_addr) &&
+            inet6_mc_check(sk, loc_addr, rmt_addr)))
+               return true;
+
+       return false;
 }
-EXPORT_SYMBOL_GPL(__raw_v6_lookup);
+EXPORT_SYMBOL_GPL(raw_v6_match);
 
 /*
  *     0 - deliver
@@ -156,31 +142,28 @@ EXPORT_SYMBOL(rawv6_mh_filter_unregister);
  */
 static bool ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
 {
+       struct net *net = dev_net(skb->dev);
        const struct in6_addr *saddr;
        const struct in6_addr *daddr;
+       struct hlist_head *head;
        struct sock *sk;
        bool delivered = false;
        __u8 hash;
-       struct net *net;
 
        saddr = &ipv6_hdr(skb)->saddr;
        daddr = saddr + 1;
 
        hash = nexthdr & (RAW_HTABLE_SIZE - 1);
-
+       head = &raw_v6_hashinfo.ht[hash];
+       if (hlist_empty(head))
+               return false;
        read_lock(&raw_v6_hashinfo.lock);
-       sk = sk_head(&raw_v6_hashinfo.ht[hash]);
-
-       if (!sk)
-               goto out;
-
-       net = dev_net(skb->dev);
-       sk = __raw_v6_lookup(net, sk, nexthdr, daddr, saddr,
-                            inet6_iif(skb), inet6_sdif(skb));
-
-       while (sk) {
+       sk_for_each(sk, head) {
                int filtered;
 
+               if (!raw_v6_match(net, sk, nexthdr, daddr, saddr,
+                                 inet6_iif(skb), inet6_sdif(skb)))
+                       continue;
                delivered = true;
                switch (nexthdr) {
                case IPPROTO_ICMPV6:
@@ -219,23 +202,14 @@ static bool ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
                                rawv6_rcv(sk, clone);
                        }
                }
-               sk = __raw_v6_lookup(net, sk_next(sk), nexthdr, daddr, saddr,
-                                    inet6_iif(skb), inet6_sdif(skb));
        }
-out:
        read_unlock(&raw_v6_hashinfo.lock);
        return delivered;
 }
 
 bool raw6_local_deliver(struct sk_buff *skb, int nexthdr)
 {
-       struct sock *raw_sk;
-
-       raw_sk = sk_head(&raw_v6_hashinfo.ht[nexthdr & (RAW_HTABLE_SIZE - 1)]);
-       if (raw_sk && !ipv6_raw_deliver(skb, nexthdr))
-               raw_sk = NULL;
-
-       return raw_sk != NULL;
+       return ipv6_raw_deliver(skb, nexthdr);
 }
 
 /* This cleans up af_inet6 a bit. -DaveM */
@@ -361,28 +335,25 @@ static void rawv6_err(struct sock *sk, struct sk_buff *skb,
 void raw6_icmp_error(struct sk_buff *skb, int nexthdr,
                u8 type, u8 code, int inner_offset, __be32 info)
 {
+       const struct in6_addr *saddr, *daddr;
+       struct net *net = dev_net(skb->dev);
+       struct hlist_head *head;
        struct sock *sk;
        int hash;
-       const struct in6_addr *saddr, *daddr;
-       struct net *net;
 
        hash = nexthdr & (RAW_HTABLE_SIZE - 1);
-
+       head = &raw_v6_hashinfo.ht[hash];
        read_lock(&raw_v6_hashinfo.lock);
-       sk = sk_head(&raw_v6_hashinfo.ht[hash]);
-       if (sk) {
+       sk_for_each(sk, head) {
                /* Note: ipv6_hdr(skb) != skb->data */
                const struct ipv6hdr *ip6h = (const struct ipv6hdr *)skb->data;
                saddr = &ip6h->saddr;
                daddr = &ip6h->daddr;
-               net = dev_net(skb->dev);
 
-               while ((sk = __raw_v6_lookup(net, sk, nexthdr, saddr, daddr,
-                                            inet6_iif(skb), inet6_iif(skb)))) {
-                       rawv6_err(sk, skb, NULL, type, code,
-                                       inner_offset, info);
-                       sk = sk_next(sk);
-               }
+               if (!raw_v6_match(net, sk, nexthdr, &ip6h->saddr, &ip6h->daddr,
+                                 inet6_iif(skb), inet6_iif(skb)))
+                       continue;
+               rawv6_err(sk, skb, NULL, type, code, inner_offset, info);
        }
        read_unlock(&raw_v6_hashinfo.lock);
 }