Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-drm-fsl-dcu.git] / net / netfilter / xt_string.c

diff --git a/net/netfilter/xt_string.c b/net/netfilter/xt_string.c
index 96801ffd8af8d79c33e2d30fdd62c39ade795265..d3c48b14ab94c09d74f0c74e62b94ed5fcb58af7 100644 (file)
--- a/net/netfilter/xt_string.c
+++ b/net/netfilter/xt_string.c
@@ -23,16 +23,14 @@ MODULE_ALIAS("ipt_string");
 MODULE_ALIAS("ip6t_string");
 
 static bool
-string_mt(const struct sk_buff *skb, const struct xt_match_param *par)
+string_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
        const struct xt_string_info *conf = par->matchinfo;
        struct ts_state state;
-       int invert;
+       bool invert;
 
        memset(&state, 0, sizeof(struct ts_state));
-
-       invert = (par->match->revision == 0 ? conf->u.v0.invert :
-                                   conf->u.v1.flags & XT_STRING_FLAG_INVERT);
+       invert = conf->u.v1.flags & XT_STRING_FLAG_INVERT;
 
        return (skb_find_text((struct sk_buff *)skb, conf->from_offset,
                             conf->to_offset, conf->config, &state)
@@ -41,7 +39,7 @@ string_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 
 #define STRING_TEXT_PRIV(m) ((struct xt_string_info *)(m))
 
-static bool string_mt_check(const struct xt_mtchk_param *par)
+static int string_mt_check(const struct xt_mtchk_param *par)
 {
        struct xt_string_info *conf = par->matchinfo;
        struct ts_config *ts_conf;
@@ -49,26 +47,23 @@ static bool string_mt_check(const struct xt_mtchk_param *par)
 
        /* Damn, can't handle this case properly with iptables... */
        if (conf->from_offset > conf->to_offset)
-               return false;
+               return -EINVAL;
        if (conf->algo[XT_STRING_MAX_ALGO_NAME_SIZE - 1] != '\0')
-               return false;
+               return -EINVAL;
        if (conf->patlen > XT_STRING_MAX_PATTERN_SIZE)
-               return false;
-       if (par->match->revision == 1) {
-               if (conf->u.v1.flags &
-                   ~(XT_STRING_FLAG_IGNORECASE | XT_STRING_FLAG_INVERT))
-                       return false;
-               if (conf->u.v1.flags & XT_STRING_FLAG_IGNORECASE)
-                       flags |= TS_IGNORECASE;
-       }
+               return -EINVAL;
+       if (conf->u.v1.flags &
+           ~(XT_STRING_FLAG_IGNORECASE | XT_STRING_FLAG_INVERT))
+               return -EINVAL;
+       if (conf->u.v1.flags & XT_STRING_FLAG_IGNORECASE)
+               flags |= TS_IGNORECASE;
        ts_conf = textsearch_prepare(conf->algo, conf->pattern, conf->patlen,
                                     GFP_KERNEL, flags);
        if (IS_ERR(ts_conf))
-               return false;
+               return PTR_ERR(ts_conf);
 
        conf->config = ts_conf;
-
-       return true;
+       return 0;
 }
 
 static void string_mt_destroy(const struct xt_mtdtor_param *par)
@@ -76,38 +71,25 @@ static void string_mt_destroy(const struct xt_mtdtor_param *par)
        textsearch_destroy(STRING_TEXT_PRIV(par->matchinfo)->config);
 }
 
-static struct xt_match xt_string_mt_reg[] __read_mostly = {
-       {
-               .name           = "string",
-               .revision       = 0,
-               .family         = NFPROTO_UNSPEC,
-               .checkentry     = string_mt_check,
-               .match          = string_mt,
-               .destroy        = string_mt_destroy,
-               .matchsize      = sizeof(struct xt_string_info),
-               .me             = THIS_MODULE
-       },
-       {
-               .name           = "string",
-               .revision       = 1,
-               .family         = NFPROTO_UNSPEC,
-               .checkentry     = string_mt_check,
-               .match          = string_mt,
-               .destroy        = string_mt_destroy,
-               .matchsize      = sizeof(struct xt_string_info),
-               .me             = THIS_MODULE
-       },
+static struct xt_match xt_string_mt_reg __read_mostly = {
+       .name       = "string",
+       .revision   = 1,
+       .family     = NFPROTO_UNSPEC,
+       .checkentry = string_mt_check,
+       .match      = string_mt,
+       .destroy    = string_mt_destroy,
+       .matchsize  = sizeof(struct xt_string_info),
+       .me         = THIS_MODULE,
 };
 
 static int __init string_mt_init(void)
 {
-       return xt_register_matches(xt_string_mt_reg,
-                                  ARRAY_SIZE(xt_string_mt_reg));
+       return xt_register_match(&xt_string_mt_reg);
 }
 
 static void __exit string_mt_exit(void)
 {
-       xt_unregister_matches(xt_string_mt_reg, ARRAY_SIZE(xt_string_mt_reg));
+       xt_unregister_match(&xt_string_mt_reg);
 }
 
 module_init(string_mt_init);