ALSA: asihpi - Fix uninitialized variable

[safe/jmp/linux-2.6] / net / netfilter / xt_helper.c

diff --git a/net/netfilter/xt_helper.c b/net/netfilter/xt_helper.c
index a2688b8..9f4ab00 100644 (file)
--- a/net/netfilter/xt_helper.c
+++ b/net/netfilter/xt_helper.c
@@ -6,7 +6,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/netfilter.h>
@@ -18,119 +18,82 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Martin Josefsson <gandalf@netfilter.org>");
-MODULE_DESCRIPTION("iptables helper match module");
+MODULE_DESCRIPTION("Xtables: Related connection matching");
 MODULE_ALIAS("ipt_helper");
 MODULE_ALIAS("ip6t_helper");
 
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
 
 static bool
-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 protoff,
-      bool *hotdrop)
+helper_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
-       const struct xt_helper_info *info = matchinfo;
-       struct nf_conn *ct;
-       struct nf_conn_help *master_help;
+       const struct xt_helper_info *info = par->matchinfo;
+       const struct nf_conn *ct;
+       const struct nf_conn_help *master_help;
+       const struct nf_conntrack_helper *helper;
        enum ip_conntrack_info ctinfo;
        bool ret = info->invert;
 
-       ct = nf_ct_get((struct sk_buff *)skb, &ctinfo);
-       if (!ct) {
-               DEBUGP("xt_helper: Eek! invalid conntrack?\n");
+       ct = nf_ct_get(skb, &ctinfo);
+       if (!ct || !ct->master)
                return ret;
-       }
-
-       if (!ct->master) {
-               DEBUGP("xt_helper: conntrack %p has no master\n", ct);
-               return ret;
-       }
 
-       read_lock_bh(&nf_conntrack_lock);
        master_help = nfct_help(ct->master);
-       if (!master_help || !master_help->helper) {
-               DEBUGP("xt_helper: master ct %p has no helper\n",
-                       exp->expectant);
-               goto out_unlock;
-       }
+       if (!master_help)
+               return ret;
 
-       DEBUGP("master's name = %s , info->name = %s\n",
-               ct->master->helper->name, info->name);
+       /* rcu_read_lock()ed by nf_hook_slow */
+       helper = rcu_dereference(master_help->helper);
+       if (!helper)
+               return ret;
 
        if (info->name[0] == '\0')
                ret = !ret;
        else
-               ret ^= !strncmp(master_help->helper->name, info->name,
-                               strlen(master_help->helper->name));
-out_unlock:
-       read_unlock_bh(&nf_conntrack_lock);
+               ret ^= !strncmp(helper->name, info->name,
+                               strlen(helper->name));
        return ret;
 }
 
-static bool check(const char *tablename,
-                 const void *inf,
-                 const struct xt_match *match,
-                 void *matchinfo,
-                 unsigned int hook_mask)
+static int helper_mt_check(const struct xt_mtchk_param *par)
 {
-       struct xt_helper_info *info = matchinfo;
+       struct xt_helper_info *info = par->matchinfo;
+       int ret;
 
-       if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-               printk(KERN_WARNING "can't load conntrack support for "
-                                   "proto=%d\n", match->family);
-               return false;
+       ret = nf_ct_l3proto_try_module_get(par->family);
+       if (ret < 0) {
+               pr_info("cannot load conntrack support for proto=%u\n",
+                       par->family);
+               return ret;
        }
        info->name[29] = '\0';
-       return true;
+       return 0;
 }
 
-static void
-destroy(const struct xt_match *match, void *matchinfo)
+static void helper_mt_destroy(const struct xt_mtdtor_param *par)
 {
-       nf_ct_l3proto_module_put(match->family);
+       nf_ct_l3proto_module_put(par->family);
 }
 
-static struct xt_match xt_helper_match[] = {
-       {
-               .name           = "helper",
-               .family         = AF_INET,
-               .checkentry     = check,
-               .match          = match,
-               .destroy        = destroy,
-               .matchsize      = sizeof(struct xt_helper_info),
-               .me             = THIS_MODULE,
-       },
-       {
-               .name           = "helper",
-               .family         = AF_INET6,
-               .checkentry     = check,
-               .match          = match,
-               .destroy        = destroy,
-               .matchsize      = sizeof(struct xt_helper_info),
-               .me             = THIS_MODULE,
-       },
+static struct xt_match helper_mt_reg __read_mostly = {
+       .name       = "helper",
+       .revision   = 0,
+       .family     = NFPROTO_UNSPEC,
+       .checkentry = helper_mt_check,
+       .match      = helper_mt,
+       .destroy    = helper_mt_destroy,
+       .matchsize  = sizeof(struct xt_helper_info),
+       .me         = THIS_MODULE,
 };
 
-static int __init xt_helper_init(void)
+static int __init helper_mt_init(void)
 {
-       return xt_register_matches(xt_helper_match,
-                                  ARRAY_SIZE(xt_helper_match));
+       return xt_register_match(&helper_mt_reg);
 }
 
-static void __exit xt_helper_fini(void)
+static void __exit helper_mt_exit(void)
 {
-       xt_unregister_matches(xt_helper_match, ARRAY_SIZE(xt_helper_match));
+       xt_unregister_match(&helper_mt_reg);
 }
 
-module_init(xt_helper_init);
-module_exit(xt_helper_fini);
-
+module_init(helper_mt_init);
+module_exit(helper_mt_exit);