[NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat...

[linux-2.6] / net / netfilter / xt_comment.c

diff --git a/net/netfilter/xt_comment.c b/net/netfilter/xt_comment.c
index b3f07aa593f4f8f1cd8ea77b3b30b7e4a4d3704a..197609cb06d7e6cb6249d291aeb06abc00abec75 100644 (file)
--- a/net/netfilter/xt_comment.c
+++ b/net/netfilter/xt_comment.c
@@ -19,6 +19,7 @@ static int
 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 protooff,
@@ -32,6 +33,7 @@ static struct xt_match comment_match = {
        .name           = "comment",
        .match          = match,
        .matchsize      = sizeof(struct xt_comment_info),
+       .family         = AF_INET,
        .me             = THIS_MODULE
 };
 
@@ -39,29 +41,30 @@ static struct xt_match comment6_match = {
        .name           = "comment",
        .match          = match,
        .matchsize      = sizeof(struct xt_comment_info),
+       .family         = AF_INET6,
        .me             = THIS_MODULE
 };
 
-static int __init init(void)
+static int __init xt_comment_init(void)
 {
        int ret;
 
-       ret = xt_register_match(AF_INET, &comment_match);
+       ret = xt_register_match(&comment_match);
        if (ret)
                return ret;
 
-       ret = xt_register_match(AF_INET6, &comment6_match);
+       ret = xt_register_match(&comment6_match);
        if (ret)
-               xt_unregister_match(AF_INET, &comment_match);
+               xt_unregister_match(&comment_match);
 
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_comment_fini(void)
 {
-       xt_unregister_match(AF_INET, &comment_match);
-       xt_unregister_match(AF_INET6, &comment6_match);
+       xt_unregister_match(&comment_match);
+       xt_unregister_match(&comment6_match);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_comment_init);
+module_exit(xt_comment_fini);