ipvs: ip_vs_sip_fill_param() BUG: bad check of return value
[linux-3.10.git] / net / netfilter / xt_iprange.c
index 7ac54ea..b46626c 100644 (file)
@@ -8,51 +8,16 @@
  *     it under the terms of the GNU General Public License version 2 as
  *     published by the Free Software Foundation.
  */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_iprange.h>
-#include <linux/netfilter_ipv4/ipt_iprange.h>
 
 static bool
-iprange_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)
-{
-       const struct ipt_iprange_info *info = par->matchinfo;
-       const struct iphdr *iph = ip_hdr(skb);
-
-       if (info->flags & IPRANGE_SRC) {
-               if ((ntohl(iph->saddr) < ntohl(info->src.min_ip)
-                         || ntohl(iph->saddr) > ntohl(info->src.max_ip))
-                        ^ !!(info->flags & IPRANGE_SRC_INV)) {
-                       pr_debug("src IP %u.%u.%u.%u NOT in range %s"
-                                "%u.%u.%u.%u-%u.%u.%u.%u\n",
-                                NIPQUAD(iph->saddr),
-                                info->flags & IPRANGE_SRC_INV ? "(INV) " : "",
-                                NIPQUAD(info->src.min_ip),
-                                NIPQUAD(info->src.max_ip));
-                       return false;
-               }
-       }
-       if (info->flags & IPRANGE_DST) {
-               if ((ntohl(iph->daddr) < ntohl(info->dst.min_ip)
-                         || ntohl(iph->daddr) > ntohl(info->dst.max_ip))
-                        ^ !!(info->flags & IPRANGE_DST_INV)) {
-                       pr_debug("dst IP %u.%u.%u.%u NOT in range %s"
-                                "%u.%u.%u.%u-%u.%u.%u.%u\n",
-                                NIPQUAD(iph->daddr),
-                                info->flags & IPRANGE_DST_INV ? "(INV) " : "",
-                                NIPQUAD(info->dst.min_ip),
-                                NIPQUAD(info->dst.max_ip));
-                       return false;
-               }
-       }
-       return true;
-}
-
-static bool
-iprange_mt4(const struct sk_buff *skb, const struct xt_match_param *par)
+iprange_mt4(const struct sk_buff *skb, struct xt_action_param *par)
 {
        const struct xt_iprange_mtinfo *info = par->matchinfo;
        const struct iphdr *iph = ip_hdr(skb);
@@ -63,12 +28,11 @@ iprange_mt4(const struct sk_buff *skb, const struct xt_match_param *par)
                m |= ntohl(iph->saddr) > ntohl(info->src_max.ip);
                m ^= !!(info->flags & IPRANGE_SRC_INV);
                if (m) {
-                       pr_debug("src IP " NIPQUAD_FMT " NOT in range %s"
-                                NIPQUAD_FMT "-" NIPQUAD_FMT "\n",
-                                NIPQUAD(iph->saddr),
+                       pr_debug("src IP %pI4 NOT in range %s%pI4-%pI4\n",
+                                &iph->saddr,
                                 (info->flags & IPRANGE_SRC_INV) ? "(INV) " : "",
-                                NIPQUAD(info->src_max.ip),
-                                NIPQUAD(info->src_max.ip));
+                                &info->src_min.ip,
+                                &info->src_max.ip);
                        return false;
                }
        }
@@ -77,12 +41,11 @@ iprange_mt4(const struct sk_buff *skb, const struct xt_match_param *par)
                m |= ntohl(iph->daddr) > ntohl(info->dst_max.ip);
                m ^= !!(info->flags & IPRANGE_DST_INV);
                if (m) {
-                       pr_debug("dst IP " NIPQUAD_FMT " NOT in range %s"
-                                NIPQUAD_FMT "-" NIPQUAD_FMT "\n",
-                                NIPQUAD(iph->daddr),
+                       pr_debug("dst IP %pI4 NOT in range %s%pI4-%pI4\n",
+                                &iph->daddr,
                                 (info->flags & IPRANGE_DST_INV) ? "(INV) " : "",
-                                NIPQUAD(info->dst_min.ip),
-                                NIPQUAD(info->dst_max.ip));
+                                &info->dst_min.ip,
+                                &info->dst_max.ip);
                        return false;
                }
        }
@@ -90,40 +53,50 @@ iprange_mt4(const struct sk_buff *skb, const struct xt_match_param *par)
 }
 
 static inline int
-iprange_ipv6_sub(const struct in6_addr *a, const struct in6_addr *b)
+iprange_ipv6_lt(const struct in6_addr *a, const struct in6_addr *b)
 {
        unsigned int i;
-       int r;
 
        for (i = 0; i < 4; ++i) {
-               r = ntohl(a->s6_addr32[i]) - ntohl(b->s6_addr32[i]);
-               if (r != 0)
-                       return r;
+               if (a->s6_addr32[i] != b->s6_addr32[i])
+                       return ntohl(a->s6_addr32[i]) < ntohl(b->s6_addr32[i]);
        }
 
        return 0;
 }
 
 static bool
-iprange_mt6(const struct sk_buff *skb, const struct xt_match_param *par)
+iprange_mt6(const struct sk_buff *skb, struct xt_action_param *par)
 {
        const struct xt_iprange_mtinfo *info = par->matchinfo;
        const struct ipv6hdr *iph = ipv6_hdr(skb);
        bool m;
 
        if (info->flags & IPRANGE_SRC) {
-               m  = iprange_ipv6_sub(&iph->saddr, &info->src_min.in6) < 0;
-               m |= iprange_ipv6_sub(&iph->saddr, &info->src_max.in6) > 0;
+               m  = iprange_ipv6_lt(&iph->saddr, &info->src_min.in6);
+               m |= iprange_ipv6_lt(&info->src_max.in6, &iph->saddr);
                m ^= !!(info->flags & IPRANGE_SRC_INV);
-               if (m)
+               if (m) {
+                       pr_debug("src IP %pI6 NOT in range %s%pI6-%pI6\n",
+                                &iph->saddr,
+                                (info->flags & IPRANGE_SRC_INV) ? "(INV) " : "",
+                                &info->src_min.in6,
+                                &info->src_max.in6);
                        return false;
+               }
        }
        if (info->flags & IPRANGE_DST) {
-               m  = iprange_ipv6_sub(&iph->daddr, &info->dst_min.in6) < 0;
-               m |= iprange_ipv6_sub(&iph->daddr, &info->dst_max.in6) > 0;
+               m  = iprange_ipv6_lt(&iph->daddr, &info->dst_min.in6);
+               m |= iprange_ipv6_lt(&info->dst_max.in6, &iph->daddr);
                m ^= !!(info->flags & IPRANGE_DST_INV);
-               if (m)
+               if (m) {
+                       pr_debug("dst IP %pI6 NOT in range %s%pI6-%pI6\n",
+                                &iph->daddr,
+                                (info->flags & IPRANGE_DST_INV) ? "(INV) " : "",
+                                &info->dst_min.in6,
+                                &info->dst_max.in6);
                        return false;
+               }
        }
        return true;
 }
@@ -131,14 +104,6 @@ iprange_mt6(const struct sk_buff *skb, const struct xt_match_param *par)
 static struct xt_match iprange_mt_reg[] __read_mostly = {
        {
                .name      = "iprange",
-               .revision  = 0,
-               .family    = NFPROTO_IPV4,
-               .match     = iprange_mt_v0,
-               .matchsize = sizeof(struct ipt_iprange_info),
-               .me        = THIS_MODULE,
-       },
-       {
-               .name      = "iprange",
                .revision  = 1,
                .family    = NFPROTO_IPV4,
                .match     = iprange_mt4,
@@ -168,7 +133,8 @@ static void __exit iprange_mt_exit(void)
 module_init(iprange_mt_init);
 module_exit(iprange_mt_exit);
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>, Jan Engelhardt <jengelh@computergmbh.de>");
+MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
+MODULE_AUTHOR("Jan Engelhardt <jengelh@medozas.de>");
 MODULE_DESCRIPTION("Xtables: arbitrary IPv4 range matching");
 MODULE_ALIAS("ipt_iprange");
 MODULE_ALIAS("ip6t_iprange");