netfilter: xtables: fix mangle tables

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

diff --git a/net/ipv6/netfilter/ip6t_eui64.c b/net/ipv6/netfilter/ip6t_eui64.c
index 2af99fc..ca287f6 100644 (file)
--- a/net/ipv6/netfilter/ip6t_eui64.c
+++ b/net/ipv6/netfilter/ip6t_eui64.c
@@ -15,27 +15,19 @@
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
-MODULE_DESCRIPTION("IPv6 EUI64 address checking match");
+MODULE_DESCRIPTION("Xtables: IPv6 EUI64 address match");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
 
 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,
-      bool *hotdrop)
+eui64_mt6(const struct sk_buff *skb, const struct xt_match_param *par)
 {
        unsigned char eui64[8];
-       int i = 0;
 
        if (!(skb_mac_header(skb) >= skb->head &&
              skb_mac_header(skb) + ETH_HLEN <= skb->data) &&
-           offset != 0) {
-               *hotdrop = true;
+           par->fragoff != 0) {
+               *par->hotdrop = true;
                return false;
        }
 
@@ -47,14 +39,10 @@ match(const struct sk_buff *skb,
                        memcpy(eui64 + 5, eth_hdr(skb)->h_source + 3, 3);
                        eui64[3] = 0xff;
                        eui64[4] = 0xfe;
-                       eui64[0] |= 0x02;
+                       eui64[0] ^= 0x02;
 
-                       i = 0;
-                       while (ipv6_hdr(skb)->saddr.s6_addr[8 + i] == eui64[i]
-                              && i < 8)
-                               i++;
-
-                       if (i == 8)
+                       if (!memcmp(ipv6_hdr(skb)->saddr.s6_addr + 8, eui64,
+                                   sizeof(eui64)))
                                return true;
                }
        }
@@ -62,25 +50,25 @@ match(const struct sk_buff *skb,
        return false;
 }
 
-static struct xt_match eui64_match = {
+static struct xt_match eui64_mt6_reg __read_mostly = {
        .name           = "eui64",
-       .family         = AF_INET6,
-       .match          = match,
+       .family         = NFPROTO_IPV6,
+       .match          = eui64_mt6,
        .matchsize      = sizeof(int),
-       .hooks          = (1 << NF_IP6_PRE_ROUTING) | (1 << NF_IP6_LOCAL_IN) |
-                         (1 << NF_IP6_FORWARD),
+       .hooks          = (1 << NF_INET_PRE_ROUTING) | (1 << NF_INET_LOCAL_IN) |
+                         (1 << NF_INET_FORWARD),
        .me             = THIS_MODULE,
 };
 
-static int __init ip6t_eui64_init(void)
+static int __init eui64_mt6_init(void)
 {
-       return xt_register_match(&eui64_match);
+       return xt_register_match(&eui64_mt6_reg);
 }
 
-static void __exit ip6t_eui64_fini(void)
+static void __exit eui64_mt6_exit(void)
 {
-       xt_unregister_match(&eui64_match);
+       xt_unregister_match(&eui64_mt6_reg);
 }
 
-module_init(ip6t_eui64_init);
-module_exit(ip6t_eui64_fini);
+module_init(eui64_mt6_init);
+module_exit(eui64_mt6_exit);