[IRDA]: Fix rfcomm use-after-free

[pandora-kernel.git] / net / netfilter / xt_CLASSIFY.c

diff --git a/net/netfilter/xt_CLASSIFY.c b/net/netfilter/xt_CLASSIFY.c
index 195e929..5194285 100644 (file)
--- a/net/netfilter/xt_CLASSIFY.c
+++ b/net/netfilter/xt_CLASSIFY.c
@@ -15,6 +15,8 @@
 #include <linux/ip.h>
 #include <net/checksum.h>
 
+#include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_ipv6.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_CLASSIFY.h>
 
@@ -37,7 +39,7 @@ target(struct sk_buff **pskb,
        return XT_CONTINUE;
 }
 
-static struct xt_target xt_classify_target[] = {
+static struct xt_target xt_classify_target[] __read_mostly = {
        {
                .family         = AF_INET,
                .name           = "CLASSIFY",
@@ -46,7 +48,7 @@ static struct xt_target xt_classify_target[] = {
                .table          = "mangle",
                .hooks          = (1 << NF_IP_LOCAL_OUT) |
                                  (1 << NF_IP_FORWARD) |
-                                 (1 << NF_IP_POST_ROUTING),
+                                 (1 << NF_IP_POST_ROUTING),
                .me             = THIS_MODULE,
        },
        {
@@ -55,9 +57,9 @@ static struct xt_target xt_classify_target[] = {
                .target         = target,
                .targetsize     = sizeof(struct xt_classify_target_info),
                .table          = "mangle",
-               .hooks          = (1 << NF_IP_LOCAL_OUT) |
-                                 (1 << NF_IP_FORWARD) |
-                                 (1 << NF_IP_POST_ROUTING),
+               .hooks          = (1 << NF_IP6_LOCAL_OUT) |
+                                 (1 << NF_IP6_FORWARD) |
+                                 (1 << NF_IP6_POST_ROUTING),
                .me             = THIS_MODULE,
        },
 };