netfilter: xtables: fix mangle tables
[safe/jmp/linux-2.6] / net / ipv6 / netfilter / ip6table_mangle.c
index da2c199..b6216de 100644 (file)
@@ -7,8 +7,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Extended to all five netfilter hooks by Brad Chapman & Harald Welte
  */
 #include <linux/module.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
@@ -17,115 +15,23 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
 MODULE_DESCRIPTION("ip6tables mangle table");
 
-#define MANGLE_VALID_HOOKS ((1 << NF_IP6_PRE_ROUTING) | \
-                           (1 << NF_IP6_LOCAL_IN) | \
-                           (1 << NF_IP6_FORWARD) | \
-                           (1 << NF_IP6_LOCAL_OUT) | \
-                           (1 << NF_IP6_POST_ROUTING))
-
-#if 0
-#define DEBUGP(x, args...)     printk(KERN_DEBUG x, ## args)
-#else
-#define DEBUGP(x, args...)
-#endif
-
-static struct
-{
-       struct ip6t_replace repl;
-       struct ip6t_standard entries[5];
-       struct ip6t_error term;
-} initial_table __initdata
-= { { "mangle", MANGLE_VALID_HOOKS, 6,
-      sizeof(struct ip6t_standard) * 5 + sizeof(struct ip6t_error),
-      { [NF_IP6_PRE_ROUTING]   = 0,
-       [NF_IP6_LOCAL_IN]       = sizeof(struct ip6t_standard),
-       [NF_IP6_FORWARD]        = sizeof(struct ip6t_standard) * 2,
-       [NF_IP6_LOCAL_OUT]      = sizeof(struct ip6t_standard) * 3,
-       [NF_IP6_POST_ROUTING]   = sizeof(struct ip6t_standard) * 4},
-      { [NF_IP6_PRE_ROUTING]   = 0,
-       [NF_IP6_LOCAL_IN]       = sizeof(struct ip6t_standard),
-       [NF_IP6_FORWARD]        = sizeof(struct ip6t_standard) * 2,
-       [NF_IP6_LOCAL_OUT]      = sizeof(struct ip6t_standard) * 3,
-       [NF_IP6_POST_ROUTING]   = sizeof(struct ip6t_standard) * 4},
-      0, NULL, { } },
-    {
-           /* PRE_ROUTING */
-           { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-               0,
-               sizeof(struct ip6t_entry),
-               sizeof(struct ip6t_standard),
-               0, { 0, 0 }, { } },
-             { { { { IP6T_ALIGN(sizeof(struct ip6t_standard_target)), "" } }, { } },
-               -NF_ACCEPT - 1 } },
-           /* LOCAL_IN */
-           { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-               0,
-               sizeof(struct ip6t_entry),
-               sizeof(struct ip6t_standard),
-               0, { 0, 0 }, { } },
-             { { { { IP6T_ALIGN(sizeof(struct ip6t_standard_target)), "" } }, { } },
-               -NF_ACCEPT - 1 } },
-           /* FORWARD */
-           { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-               0,
-               sizeof(struct ip6t_entry),
-               sizeof(struct ip6t_standard),
-               0, { 0, 0 }, { } },
-             { { { { IP6T_ALIGN(sizeof(struct ip6t_standard_target)), "" } }, { } },
-               -NF_ACCEPT - 1 } },
-           /* LOCAL_OUT */
-           { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-               0,
-               sizeof(struct ip6t_entry),
-               sizeof(struct ip6t_standard),
-               0, { 0, 0 }, { } },
-             { { { { IP6T_ALIGN(sizeof(struct ip6t_standard_target)), "" } }, { } },
-               -NF_ACCEPT - 1 } },
-           /* POST_ROUTING */
-           { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-               0,
-               sizeof(struct ip6t_entry),
-               sizeof(struct ip6t_standard),
-               0, { 0, 0 }, { } },
-             { { { { IP6T_ALIGN(sizeof(struct ip6t_standard_target)), "" } }, { } },
-               -NF_ACCEPT - 1 } }
-    },
-    /* ERROR */
-    { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-       0,
-       sizeof(struct ip6t_entry),
-       sizeof(struct ip6t_error),
-       0, { 0, 0 }, { } },
-      { { { { IP6T_ALIGN(sizeof(struct ip6t_error_target)), IP6T_ERROR_TARGET } },
-         { } },
-       "ERROR"
-      }
-    }
-};
+#define MANGLE_VALID_HOOKS ((1 << NF_INET_PRE_ROUTING) | \
+                           (1 << NF_INET_LOCAL_IN) | \
+                           (1 << NF_INET_FORWARD) | \
+                           (1 << NF_INET_LOCAL_OUT) | \
+                           (1 << NF_INET_POST_ROUTING))
 
-static struct xt_table packet_mangler = {
+static const struct xt_table packet_mangler = {
        .name           = "mangle",
        .valid_hooks    = MANGLE_VALID_HOOKS,
-       .lock           = RW_LOCK_UNLOCKED,
        .me             = THIS_MODULE,
-       .af             = AF_INET6,
+       .af             = NFPROTO_IPV6,
+       .priority       = NF_IP6_PRI_MANGLE,
 };
 
-/* The work comes in here from netfilter.c. */
-static unsigned int
-ip6t_route_hook(unsigned int hook,
-        struct sk_buff **pskb,
-        const struct net_device *in,
-        const struct net_device *out,
-        int (*okfn)(struct sk_buff *))
-{
-       return ip6t_do_table(pskb, hook, in, out, &packet_mangler);
-}
-
 static unsigned int
-ip6t_local_hook(unsigned int hook,
-                  struct sk_buff **pskb,
-                  const struct net_device *in,
+ip6t_local_out_hook(unsigned int hook,
+                  struct sk_buff *skb,
                   const struct net_device *out,
                   int (*okfn)(struct sk_buff *))
 {
@@ -137,8 +43,8 @@ ip6t_local_hook(unsigned int hook,
 
 #if 0
        /* root is playing with raw sockets. */
-       if ((*pskb)->len < sizeof(struct iphdr)
-           || ip_hdrlen(*pskb) < sizeof(struct iphdr)) {
+       if (skb->len < sizeof(struct iphdr) ||
+           ip_hdrlen(skb) < sizeof(struct iphdr)) {
                if (net_ratelimit())
                        printk("ip6t_hook: happy cracking.\n");
                return NF_ACCEPT;
@@ -146,89 +52,95 @@ ip6t_local_hook(unsigned int hook,
 #endif
 
        /* save source/dest address, mark, hoplimit, flowlabel, priority,  */
-       memcpy(&saddr, &(*pskb)->nh.ipv6h->saddr, sizeof(saddr));
-       memcpy(&daddr, &(*pskb)->nh.ipv6h->daddr, sizeof(daddr));
-       mark = (*pskb)->mark;
-       hop_limit = (*pskb)->nh.ipv6h->hop_limit;
+       memcpy(&saddr, &ipv6_hdr(skb)->saddr, sizeof(saddr));
+       memcpy(&daddr, &ipv6_hdr(skb)->daddr, sizeof(daddr));
+       mark = skb->mark;
+       hop_limit = ipv6_hdr(skb)->hop_limit;
 
        /* flowlabel and prio (includes version, which shouldn't change either */
-       flowlabel = *((u_int32_t *) (*pskb)->nh.ipv6h);
+       flowlabel = *((u_int32_t *)ipv6_hdr(skb));
 
-       ret = ip6t_do_table(pskb, hook, in, out, &packet_mangler);
+       ret = ip6t_do_table(skb, hook, NULL, out,
+                           dev_net(out)->ipv6.ip6table_mangle);
 
-       if (ret != NF_DROP && ret != NF_STOLEN
-               && (memcmp(&(*pskb)->nh.ipv6h->saddr, &saddr, sizeof(saddr))
-                   || memcmp(&(*pskb)->nh.ipv6h->daddr, &daddr, sizeof(daddr))
-                   || (*pskb)->mark != mark
-                   || (*pskb)->nh.ipv6h->hop_limit != hop_limit))
-               return ip6_route_me_harder(*pskb) == 0 ? ret : NF_DROP;
+       if (ret != NF_DROP && ret != NF_STOLEN &&
+           (memcmp(&ipv6_hdr(skb)->saddr, &saddr, sizeof(saddr)) ||
+            memcmp(&ipv6_hdr(skb)->daddr, &daddr, sizeof(daddr)) ||
+            skb->mark != mark ||
+            ipv6_hdr(skb)->hop_limit != hop_limit))
+               return ip6_route_me_harder(skb) == 0 ? ret : NF_DROP;
 
        return ret;
 }
 
-static struct nf_hook_ops ip6t_ops[] = {
-       {
-               .hook           = ip6t_route_hook,
-               .owner          = THIS_MODULE,
-               .pf             = PF_INET6,
-               .hooknum        = NF_IP6_PRE_ROUTING,
-               .priority       = NF_IP6_PRI_MANGLE,
-       },
-       {
-               .hook           = ip6t_local_hook,
-               .owner          = THIS_MODULE,
-               .pf             = PF_INET6,
-               .hooknum        = NF_IP6_LOCAL_IN,
-               .priority       = NF_IP6_PRI_MANGLE,
-       },
-       {
-               .hook           = ip6t_route_hook,
-               .owner          = THIS_MODULE,
-               .pf             = PF_INET6,
-               .hooknum        = NF_IP6_FORWARD,
-               .priority       = NF_IP6_PRI_MANGLE,
-       },
-       {
-               .hook           = ip6t_local_hook,
-               .owner          = THIS_MODULE,
-               .pf             = PF_INET6,
-               .hooknum        = NF_IP6_LOCAL_OUT,
-               .priority       = NF_IP6_PRI_MANGLE,
-       },
-       {
-               .hook           = ip6t_route_hook,
-               .owner          = THIS_MODULE,
-               .pf             = PF_INET6,
-               .hooknum        = NF_IP6_POST_ROUTING,
-               .priority       = NF_IP6_PRI_MANGLE,
-       },
+/* The work comes in here from netfilter.c. */
+static unsigned int
+ip6table_mangle_hook(unsigned int hook, struct sk_buff *skb,
+                    const struct net_device *in, const struct net_device *out,
+                    int (*okfn)(struct sk_buff *))
+{
+       if (hook == NF_INET_LOCAL_OUT)
+               return ip6t_local_out_hook(hook, skb, out, okfn);
+       if (hook == NF_INET_POST_ROUTING)
+               return ip6t_do_table(skb, hook, in, out,
+                                    dev_net(out)->ipv6.ip6table_mangle);
+       /* INPUT/FORWARD */
+       return ip6t_do_table(skb, hook, in, out,
+                            dev_net(in)->ipv6.ip6table_mangle);
+}
+
+static struct nf_hook_ops *mangle_ops __read_mostly;
+static int __net_init ip6table_mangle_net_init(struct net *net)
+{
+       struct ip6t_replace *repl;
+
+       repl = ip6t_alloc_initial_table(&packet_mangler);
+       if (repl == NULL)
+               return -ENOMEM;
+       net->ipv6.ip6table_mangle =
+               ip6t_register_table(net, &packet_mangler, repl);
+       kfree(repl);
+       if (IS_ERR(net->ipv6.ip6table_mangle))
+               return PTR_ERR(net->ipv6.ip6table_mangle);
+       return 0;
+}
+
+static void __net_exit ip6table_mangle_net_exit(struct net *net)
+{
+       ip6t_unregister_table(net, net->ipv6.ip6table_mangle);
+}
+
+static struct pernet_operations ip6table_mangle_net_ops = {
+       .init = ip6table_mangle_net_init,
+       .exit = ip6table_mangle_net_exit,
 };
 
 static int __init ip6table_mangle_init(void)
 {
        int ret;
 
-       /* Register table */
-       ret = ip6t_register_table(&packet_mangler, &initial_table.repl);
+       ret = register_pernet_subsys(&ip6table_mangle_net_ops);
        if (ret < 0)
                return ret;
 
        /* Register hooks */
-       ret = nf_register_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
-       if (ret < 0)
+       mangle_ops = xt_hook_link(&packet_mangler, ip6table_mangle_hook);
+       if (IS_ERR(mangle_ops)) {
+               ret = PTR_ERR(mangle_ops);
                goto cleanup_table;
+       }
 
        return ret;
 
  cleanup_table:
-       ip6t_unregister_table(&packet_mangler);
+       unregister_pernet_subsys(&ip6table_mangle_net_ops);
        return ret;
 }
 
 static void __exit ip6table_mangle_fini(void)
 {
-       nf_unregister_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
-       ip6t_unregister_table(&packet_mangler);
+       xt_hook_unlink(&packet_mangler, mangle_ops);
+       unregister_pernet_subsys(&ip6table_mangle_net_ops);
 }
 
 module_init(ip6table_mangle_init);