[NETFILTER]: x_tables: mark matches and targets __read_mostly

[safe/jmp/linux-2.6] / net / ipv6 / netfilter / ip6t_frag.c

diff --git a/net/ipv6/netfilter/ip6t_frag.c b/net/ipv6/netfilter/ip6t_frag.c
index 305de9b..bb1cfa8 100644 (file)
--- a/net/ipv6/netfilter/ip6t_frag.c
+++ b/net/ipv6/netfilter/ip6t_frag.c
@@ -14,6 +14,7 @@
 #include <net/checksum.h>
 #include <net/ipv6.h>
 
+#include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter_ipv6/ip6t_frag.h>
 
@@ -28,10 +29,10 @@ MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
 #endif
 
 /* Returns 1 if the id is matched by the range, 0 otherwise */
-static inline int
-id_match(u_int32_t min, u_int32_t max, u_int32_t id, int invert)
+static inline bool
+id_match(u_int32_t min, u_int32_t max, u_int32_t id, bool invert)
 {
-       int r = 0;
+       bool r;
        DEBUGP("frag id_match:%c 0x%x <= 0x%x <= 0x%x", invert ? '!' : ' ',
               min, id, max);
        r = (id >= min && id <= max) ^ invert;
@@ -39,26 +40,33 @@ id_match(u_int32_t min, u_int32_t max, u_int32_t id, int invert)
        return r;
 }
 
-static int
+static bool
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
+      const struct xt_match *match,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
-      int *hotdrop)
+      bool *hotdrop)
 {
-       struct frag_hdr _frag, *fh;
+       struct frag_hdr _frag;
+       const struct frag_hdr *fh;
        const struct ip6t_frag *fraginfo = matchinfo;
        unsigned int ptr;
+       int err;
 
-       if (ipv6_find_hdr(skb, &ptr, NEXTHDR_FRAGMENT, NULL) < 0)
-               return 0;
+       err = ipv6_find_hdr(skb, &ptr, NEXTHDR_FRAGMENT, NULL);
+       if (err < 0) {
+               if (err != -ENOENT)
+                       *hotdrop = true;
+               return false;
+       }
 
        fh = skb_header_pointer(skb, ptr, sizeof(_frag), &_frag);
        if (fh == NULL) {
-               *hotdrop = 1;
-               return 0;
+               *hotdrop = true;
+               return false;
        }
 
        DEBUGP("INFO %04X ", fh->frag_off);
@@ -69,35 +77,35 @@ match(const struct sk_buff *skb,
               ntohl(fh->identification));
 
        DEBUGP("IPv6 FRAG id %02X ",
-              (id_match(fraginfo->ids[0], fraginfo->ids[1],
+              id_match(fraginfo->ids[0], fraginfo->ids[1],
                         ntohl(fh->identification),
-                        !!(fraginfo->invflags & IP6T_FRAG_INV_IDS))));
+                        !!(fraginfo->invflags & IP6T_FRAG_INV_IDS)));
        DEBUGP("res %02X %02X%04X %02X ",
-              (fraginfo->flags & IP6T_FRAG_RES), fh->reserved,
+              fraginfo->flags & IP6T_FRAG_RES, fh->reserved,
               ntohs(fh->frag_off) & 0x6,
               !((fraginfo->flags & IP6T_FRAG_RES)
                 && (fh->reserved || (ntohs(fh->frag_off) & 0x06))));
        DEBUGP("first %02X %02X %02X ",
-              (fraginfo->flags & IP6T_FRAG_FST),
+              fraginfo->flags & IP6T_FRAG_FST,
               ntohs(fh->frag_off) & ~0x7,
               !((fraginfo->flags & IP6T_FRAG_FST)
                 && (ntohs(fh->frag_off) & ~0x7)));
        DEBUGP("mf %02X %02X %02X ",
-              (fraginfo->flags & IP6T_FRAG_MF),
+              fraginfo->flags & IP6T_FRAG_MF,
               ntohs(fh->frag_off) & IP6_MF,
               !((fraginfo->flags & IP6T_FRAG_MF)
                 && !((ntohs(fh->frag_off) & IP6_MF))));
        DEBUGP("last %02X %02X %02X\n",
-              (fraginfo->flags & IP6T_FRAG_NMF),
+              fraginfo->flags & IP6T_FRAG_NMF,
               ntohs(fh->frag_off) & IP6_MF,
               !((fraginfo->flags & IP6T_FRAG_NMF)
                 && (ntohs(fh->frag_off) & IP6_MF)));
 
        return (fh != NULL)
               &&
-              (id_match(fraginfo->ids[0], fraginfo->ids[1],
-                        ntohl(fh->identification),
-                        !!(fraginfo->invflags & IP6T_FRAG_INV_IDS)))
+              id_match(fraginfo->ids[0], fraginfo->ids[1],
+                       ntohl(fh->identification),
+                       !!(fraginfo->invflags & IP6T_FRAG_INV_IDS))
               &&
               !((fraginfo->flags & IP6T_FRAG_RES)
                 && (fh->reserved || (ntohs(fh->frag_off) & 0x6)))
@@ -113,39 +121,40 @@ match(const struct sk_buff *skb,
 }
 
 /* Called when user tries to insert an entry of this type. */
-static int
+static bool
 checkentry(const char *tablename,
           const void *ip,
+          const struct xt_match *match,
           void *matchinfo,
-          unsigned int matchinfosize,
           unsigned int hook_mask)
 {
        const struct ip6t_frag *fraginfo = matchinfo;
 
        if (fraginfo->invflags & ~IP6T_FRAG_INV_MASK) {
                DEBUGP("ip6t_frag: unknown flags %X\n", fraginfo->invflags);
-               return 0;
+               return false;
        }
-       return 1;
+       return true;
 }
 
-static struct ip6t_match frag_match = {
+static struct xt_match frag_match __read_mostly = {
        .name           = "frag",
+       .family         = AF_INET6,
        .match          = match,
        .matchsize      = sizeof(struct ip6t_frag),
        .checkentry     = checkentry,
        .me             = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init ip6t_frag_init(void)
 {
-       return ip6t_register_match(&frag_match);
+       return xt_register_match(&frag_match);
 }
 
-static void __exit cleanup(void)
+static void __exit ip6t_frag_fini(void)
 {
-       ip6t_unregister_match(&frag_match);
+       xt_unregister_match(&frag_match);
 }
 
-module_init(init);
-module_exit(cleanup);
+module_init(ip6t_frag_init);
+module_exit(ip6t_frag_fini);