[IrDA] af_irda: Silence kernel message in irda_recvmsg_stream

[powerpc.git] / net / netfilter / xt_connmark.c

diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index 7b16f1e..e180325 100644 (file)
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -21,16 +21,15 @@
 
 #include <linux/module.h>
 #include <linux/skbuff.h>
+#include <net/netfilter/nf_conntrack.h>
+#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter/xt_connmark.h>
 
 MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>");
 MODULE_DESCRIPTION("IP tables connmark match module");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ipt_connmark");
 
-#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_connmark.h>
-#include <net/netfilter/nf_conntrack_compat.h>
-
 static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
@@ -42,12 +41,14 @@ match(const struct sk_buff *skb,
       int *hotdrop)
 {
        const struct xt_connmark_info *info = matchinfo;
-       u_int32_t ctinfo;
-       const u_int32_t *ctmark = nf_ct_get_mark(skb, &ctinfo);
-       if (!ctmark)
+       struct nf_conn *ct;
+       enum ip_conntrack_info ctinfo;
+
+       ct = nf_ct_get(skb, &ctinfo);
+       if (!ct)
                return 0;
 
-       return (((*ctmark) & info->mask) == info->mark) ^ info->invert;
+       return (((ct->mark) & info->mask) == info->mark) ^ info->invert;
 }
 
 static int
@@ -55,74 +56,95 @@ checkentry(const char *tablename,
           const void *ip,
           const struct xt_match *match,
           void *matchinfo,
-          unsigned int matchsize,
           unsigned int hook_mask)
 {
-       struct xt_connmark_info *cm = (struct xt_connmark_info *)matchinfo;
+       struct xt_connmark_info *cm = matchinfo;
 
        if (cm->mark > 0xffffffff || cm->mask > 0xffffffff) {
                printk(KERN_WARNING "connmark: only support 32bit mark\n");
                return 0;
        }
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-               printk(KERN_WARNING "can't load nf_conntrack support for "
+               printk(KERN_WARNING "can't load conntrack support for "
                                    "proto=%d\n", match->family);
                return 0;
        }
-#endif
        return 1;
 }
 
 static void
-destroy(const struct xt_match *match, void *matchinfo, unsigned int matchsize)
+destroy(const struct xt_match *match, void *matchinfo)
 {
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_ct_l3proto_module_put(match->family);
-#endif
 }
 
-static struct xt_match connmark_match = {
-       .name           = "connmark",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_connmark_info),
-       .checkentry     = checkentry,
-       .destroy        = destroy,
-       .family         = AF_INET,
-       .me             = THIS_MODULE
+#ifdef CONFIG_COMPAT
+struct compat_xt_connmark_info {
+       compat_ulong_t  mark, mask;
+       u_int8_t        invert;
+       u_int8_t        __pad1;
+       u_int16_t       __pad2;
 };
 
-static struct xt_match connmark6_match = {
-       .name           = "connmark",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_connmark_info),
-       .checkentry     = checkentry,
-       .destroy        = destroy,
-       .family         = AF_INET6,
-       .me             = THIS_MODULE
-};
-
-static int __init init(void)
+static void compat_from_user(void *dst, void *src)
 {
-       int ret;
-
-       need_conntrack();
+       struct compat_xt_connmark_info *cm = src;
+       struct xt_connmark_info m = {
+               .mark   = cm->mark,
+               .mask   = cm->mask,
+               .invert = cm->invert,
+       };
+       memcpy(dst, &m, sizeof(m));
+}
 
-       ret = xt_register_match(&connmark_match);
-       if (ret)
-               return ret;
+static int compat_to_user(void __user *dst, void *src)
+{
+       struct xt_connmark_info *m = src;
+       struct compat_xt_connmark_info cm = {
+               .mark   = m->mark,
+               .mask   = m->mask,
+               .invert = m->invert,
+       };
+       return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
+}
+#endif /* CONFIG_COMPAT */
+
+static struct xt_match xt_connmark_match[] = {
+       {
+               .name           = "connmark",
+               .family         = AF_INET,
+               .checkentry     = checkentry,
+               .match          = match,
+               .destroy        = destroy,
+               .matchsize      = sizeof(struct xt_connmark_info),
+#ifdef CONFIG_COMPAT
+               .compatsize     = sizeof(struct compat_xt_connmark_info),
+               .compat_from_user = compat_from_user,
+               .compat_to_user = compat_to_user,
+#endif
+               .me             = THIS_MODULE
+       },
+       {
+               .name           = "connmark",
+               .family         = AF_INET6,
+               .checkentry     = checkentry,
+               .match          = match,
+               .destroy        = destroy,
+               .matchsize      = sizeof(struct xt_connmark_info),
+               .me             = THIS_MODULE
+       },
+};
 
-       ret = xt_register_match(&connmark6_match);
-       if (ret)
-               xt_unregister_match(&connmark_match);
-       return ret;
+static int __init xt_connmark_init(void)
+{
+       return xt_register_matches(xt_connmark_match,
+                                  ARRAY_SIZE(xt_connmark_match));
 }
 
-static void __exit fini(void)
+static void __exit xt_connmark_fini(void)
 {
-       xt_unregister_match(&connmark6_match);
-       xt_unregister_match(&connmark_match);
+       xt_unregister_matches(xt_connmark_match, ARRAY_SIZE(xt_connmark_match));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_connmark_init);
+module_exit(xt_connmark_fini);