[NETFILTER]: Convert x_tables matches/targets to centralized error checking

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/netfilter/xt_CLASSIFY.c b/net/netfilter/xt_CLASSIFY.c
index 78ee266..6b36e84 100644 (file)
--- a/net/netfilter/xt_CLASSIFY.c
+++ b/net/netfilter/xt_CLASSIFY.c
@@ -39,47 +39,22 @@ target(struct sk_buff **pskb,
        return XT_CONTINUE;
 }
 
-static int
-checkentry(const char *tablename,
-           const void *e,
-           void *targinfo,
-           unsigned int targinfosize,
-           unsigned int hook_mask)
-{
-       if (targinfosize != XT_ALIGN(sizeof(struct xt_classify_target_info))){
-               printk(KERN_ERR "CLASSIFY: invalid size (%u != %Zu).\n",
-                      targinfosize,
-                      XT_ALIGN(sizeof(struct xt_classify_target_info)));
-               return 0;
-       }
-       
-       if (hook_mask & ~((1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_FORWARD) |
-                         (1 << NF_IP_POST_ROUTING))) {
-               printk(KERN_ERR "CLASSIFY: only valid in LOCAL_OUT, FORWARD "
-                               "and POST_ROUTING.\n");
-               return 0;
-       }
-
-       if (strcmp(tablename, "mangle") != 0) {
-               printk(KERN_ERR "CLASSIFY: can only be called from "
-                               "\"mangle\" table, not \"%s\".\n",
-                               tablename);
-               return 0;
-       }
-
-       return 1;
-}
-
 static struct xt_target classify_reg = { 
        .name           = "CLASSIFY", 
        .target         = target,
-       .checkentry     = checkentry,
+       .targetsize     = sizeof(struct xt_classify_target_info),
+       .table          = "mangle",
+       .hooks          = (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_FORWARD) |
+                         (1 << NF_IP_POST_ROUTING),
        .me             = THIS_MODULE,
 };
 static struct xt_target classify6_reg = { 
        .name           = "CLASSIFY", 
        .target         = target,
-       .checkentry     = checkentry,
+       .targetsize     = sizeof(struct xt_classify_target_info),
+       .table          = "mangle",
+       .hooks          = (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_FORWARD) |
+                         (1 << NF_IP_POST_ROUTING),
        .me             = THIS_MODULE,
 };
 

diff --cc net/netfilter/xt_CONNMARK.c
Simple merge

diff --cc net/netfilter/xt_MARK.c
Simple merge

diff --cc net/netfilter/xt_NFQUEUE.c
Simple merge

diff --cc net/netfilter/xt_NOTRACK.c
Simple merge

diff --cc net/netfilter/xt_comment.c
Simple merge

diff --cc net/netfilter/xt_connbytes.c
Simple merge

diff --cc net/netfilter/xt_connmark.c
Simple merge

diff --cc net/netfilter/xt_conntrack.c
Simple merge

diff --cc net/netfilter/xt_dccp.c
Simple merge

diff --cc net/netfilter/xt_helper.c
Simple merge

diff --cc net/netfilter/xt_length.c
Simple merge

diff --cc net/netfilter/xt_limit.c
Simple merge

diff --cc net/netfilter/xt_mac.c
Simple merge

diff --cc net/netfilter/xt_mark.c
Simple merge

diff --cc net/netfilter/xt_physdev.c
Simple merge

diff --cc net/netfilter/xt_pkttype.c
Simple merge

diff --cc net/netfilter/xt_realm.c
Simple merge

diff --cc net/netfilter/xt_sctp.c
Simple merge

diff --cc net/netfilter/xt_state.c
Simple merge

diff --cc net/netfilter/xt_string.c
Simple merge

diff --cc net/netfilter/xt_tcpmss.c
Simple merge

diff --cc net/netfilter/xt_tcpudp.c
Simple merge