netfilter: xtables: fix mangle tables
[safe/jmp/linux-2.6] / net / ipv4 / netfilter / iptable_mangle.c
index b4360a6..c833330 100644 (file)
@@ -21,68 +21,20 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
 MODULE_DESCRIPTION("iptables mangle table");
 
-#define MANGLE_VALID_HOOKS ((1 << NF_IP_PRE_ROUTING) | \
-                           (1 << NF_IP_LOCAL_IN) | \
-                           (1 << NF_IP_FORWARD) | \
-                           (1 << NF_IP_LOCAL_OUT) | \
-                           (1 << NF_IP_POST_ROUTING))
-
-/* Ouch - five different hooks? Maybe this should be a config option..... -- BC */
-static struct
-{
-       struct ipt_replace repl;
-       struct ipt_standard entries[5];
-       struct ipt_error term;
-} initial_table __initdata = {
-       .repl = {
-               .name = "mangle",
-               .valid_hooks = MANGLE_VALID_HOOKS,
-               .num_entries = 6,
-               .size = sizeof(struct ipt_standard) * 5 + sizeof(struct ipt_error),
-               .hook_entry = {
-                       [NF_IP_PRE_ROUTING]     = 0,
-                       [NF_IP_LOCAL_IN]        = sizeof(struct ipt_standard),
-                       [NF_IP_FORWARD]         = sizeof(struct ipt_standard) * 2,
-                       [NF_IP_LOCAL_OUT]       = sizeof(struct ipt_standard) * 3,
-                       [NF_IP_POST_ROUTING]    = sizeof(struct ipt_standard) * 4,
-               },
-               .underflow = {
-                       [NF_IP_PRE_ROUTING]     = 0,
-                       [NF_IP_LOCAL_IN]        = sizeof(struct ipt_standard),
-                       [NF_IP_FORWARD]         = sizeof(struct ipt_standard) * 2,
-                       [NF_IP_LOCAL_OUT]       = sizeof(struct ipt_standard) * 3,
-                       [NF_IP_POST_ROUTING]    = sizeof(struct ipt_standard) * 4,
-               },
-       },
-       .entries = {
-               IPT_STANDARD_INIT(NF_ACCEPT),   /* PRE_ROUTING */
-               IPT_STANDARD_INIT(NF_ACCEPT),   /* LOCAL_IN */
-               IPT_STANDARD_INIT(NF_ACCEPT),   /* FORWARD */
-               IPT_STANDARD_INIT(NF_ACCEPT),   /* LOCAL_OUT */
-               IPT_STANDARD_INIT(NF_ACCEPT),   /* POST_ROUTING */
-       },
-       .term = IPT_ERROR_INIT,                 /* 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_INET,
+       .af             = NFPROTO_IPV4,
+       .priority       = NF_IP_PRI_MANGLE,
 };
 
-/* The work comes in here from netfilter.c. */
-static unsigned int
-ipt_route_hook(unsigned int hook,
-        struct sk_buff *skb,
-        const struct net_device *in,
-        const struct net_device *out,
-        int (*okfn)(struct sk_buff *))
-{
-       return ipt_do_table(skb, hook, in, out, &packet_mangler);
-}
-
 static unsigned int
 ipt_local_hook(unsigned int hook,
                   struct sk_buff *skb,
@@ -97,13 +49,9 @@ ipt_local_hook(unsigned int hook,
        u_int32_t mark;
 
        /* root is playing with raw sockets. */
-       if (skb->len < sizeof(struct iphdr)
-           || ip_hdrlen(skb) < sizeof(struct iphdr)) {
-               if (net_ratelimit())
-                       printk("iptable_mangle: ignoring short SOCK_RAW "
-                              "packet.\n");
+       if (skb->len < sizeof(struct iphdr) ||
+           ip_hdrlen(skb) < sizeof(struct iphdr))
                return NF_ACCEPT;
-       }
 
        /* Save things which could affect route */
        mark = skb->mark;
@@ -112,7 +60,8 @@ ipt_local_hook(unsigned int hook,
        daddr = iph->daddr;
        tos = iph->tos;
 
-       ret = ipt_do_table(skb, hook, in, out, &packet_mangler);
+       ret = ipt_do_table(skb, hook, in, out,
+                          dev_net(out)->ipv4.iptable_mangle);
        /* Reroute for ANY change. */
        if (ret != NF_DROP && ret != NF_STOLEN && ret != NF_QUEUE) {
                iph = ip_hdr(skb);
@@ -128,69 +77,77 @@ ipt_local_hook(unsigned int hook,
        return ret;
 }
 
-static struct nf_hook_ops ipt_ops[] = {
-       {
-               .hook           = ipt_route_hook,
-               .owner          = THIS_MODULE,
-               .pf             = PF_INET,
-               .hooknum        = NF_IP_PRE_ROUTING,
-               .priority       = NF_IP_PRI_MANGLE,
-       },
-       {
-               .hook           = ipt_route_hook,
-               .owner          = THIS_MODULE,
-               .pf             = PF_INET,
-               .hooknum        = NF_IP_LOCAL_IN,
-               .priority       = NF_IP_PRI_MANGLE,
-       },
-       {
-               .hook           = ipt_route_hook,
-               .owner          = THIS_MODULE,
-               .pf             = PF_INET,
-               .hooknum        = NF_IP_FORWARD,
-               .priority       = NF_IP_PRI_MANGLE,
-       },
-       {
-               .hook           = ipt_local_hook,
-               .owner          = THIS_MODULE,
-               .pf             = PF_INET,
-               .hooknum        = NF_IP_LOCAL_OUT,
-               .priority       = NF_IP_PRI_MANGLE,
-       },
-       {
-               .hook           = ipt_route_hook,
-               .owner          = THIS_MODULE,
-               .pf             = PF_INET,
-               .hooknum        = NF_IP_POST_ROUTING,
-               .priority       = NF_IP_PRI_MANGLE,
-       },
+/* The work comes in here from netfilter.c. */
+static unsigned int
+iptable_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 ipt_local_hook(hook, skb, in, out, okfn);
+       if (hook == NF_INET_POST_ROUTING)
+               return ipt_do_table(skb, hook, in, out,
+                                   dev_net(out)->ipv4.iptable_mangle);
+       /* PREROUTING/INPUT/FORWARD: */
+       return ipt_do_table(skb, hook, in, out,
+                           dev_net(in)->ipv4.iptable_mangle);
+}
+
+static struct nf_hook_ops *mangle_ops __read_mostly;
+
+static int __net_init iptable_mangle_net_init(struct net *net)
+{
+       struct ipt_replace *repl;
+
+       repl = ipt_alloc_initial_table(&packet_mangler);
+       if (repl == NULL)
+               return -ENOMEM;
+       net->ipv4.iptable_mangle =
+               ipt_register_table(net, &packet_mangler, repl);
+       kfree(repl);
+       if (IS_ERR(net->ipv4.iptable_mangle))
+               return PTR_ERR(net->ipv4.iptable_mangle);
+       return 0;
+}
+
+static void __net_exit iptable_mangle_net_exit(struct net *net)
+{
+       ipt_unregister_table(net, net->ipv4.iptable_mangle);
+}
+
+static struct pernet_operations iptable_mangle_net_ops = {
+       .init = iptable_mangle_net_init,
+       .exit = iptable_mangle_net_exit,
 };
 
 static int __init iptable_mangle_init(void)
 {
        int ret;
 
-       /* Register table */
-       ret = ipt_register_table(&packet_mangler, &initial_table.repl);
+       ret = register_pernet_subsys(&iptable_mangle_net_ops);
        if (ret < 0)
                return ret;
 
        /* Register hooks */
-       ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
-       if (ret < 0)
+       mangle_ops = xt_hook_link(&packet_mangler, iptable_mangle_hook);
+       if (IS_ERR(mangle_ops)) {
+               ret = PTR_ERR(mangle_ops);
                goto cleanup_table;
+       }
 
        return ret;
 
  cleanup_table:
-       ipt_unregister_table(&packet_mangler);
+       unregister_pernet_subsys(&iptable_mangle_net_ops);
        return ret;
 }
 
 static void __exit iptable_mangle_fini(void)
 {
-       nf_unregister_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
-       ipt_unregister_table(&packet_mangler);
+       xt_hook_unlink(&packet_mangler, mangle_ops);
+       unregister_pernet_subsys(&iptable_mangle_net_ops);
 }
 
 module_init(iptable_mangle_init);