fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / netfilter / xt_mark.c

diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index 2a0ac62..dfa1ee6 100644 (file)
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -23,6 +23,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 protoff,
@@ -30,62 +31,89 @@ match(const struct sk_buff *skb,
 {
        const struct xt_mark_info *info = matchinfo;
 
-       return ((skb->nfmark & info->mask) == info->mark) ^ info->invert;
+       return ((skb->mark & info->mask) == info->mark) ^ info->invert;
 }
 
 static int
 checkentry(const char *tablename,
            const void *entry,
+          const struct xt_match *match,
            void *matchinfo,
-           unsigned int matchsize,
            unsigned int hook_mask)
 {
-       struct xt_mark_info *minfo = (struct xt_mark_info *) matchinfo;
-
-       if (matchsize != XT_ALIGN(sizeof(struct xt_mark_info)))
-               return 0;
+       const struct xt_mark_info *minfo = matchinfo;
 
        if (minfo->mark > 0xffffffff || minfo->mask > 0xffffffff) {
                printk(KERN_WARNING "mark: only supports 32bit mark\n");
                return 0;
        }
-
        return 1;
 }
 
-static struct xt_match mark_match = {
-       .name           = "mark",
-       .match          = &match,
-       .checkentry     = &checkentry,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_match mark6_match = {
-       .name           = "mark",
-       .match          = &match,
-       .checkentry     = &checkentry,
-       .me             = THIS_MODULE,
+#ifdef CONFIG_COMPAT
+struct compat_xt_mark_info {
+       compat_ulong_t  mark, mask;
+       u_int8_t        invert;
+       u_int8_t        __pad1;
+       u_int16_t       __pad2;
 };
 
-static int __init init(void)
+static void compat_from_user(void *dst, void *src)
 {
-       int ret;
-       ret = xt_register_match(AF_INET, &mark_match);
-       if (ret)
-               return ret;
+       struct compat_xt_mark_info *cm = src;
+       struct xt_mark_info m = {
+               .mark   = cm->mark,
+               .mask   = cm->mask,
+               .invert = cm->invert,
+       };
+       memcpy(dst, &m, sizeof(m));
+}
 
-       ret = xt_register_match(AF_INET6, &mark6_match);
-       if (ret)
-               xt_unregister_match(AF_INET, &mark_match);
+static int compat_to_user(void __user *dst, void *src)
+{
+       struct xt_mark_info *m = src;
+       struct compat_xt_mark_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_mark_match[] = {
+       {
+               .name           = "mark",
+               .family         = AF_INET,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_mark_info),
+#ifdef CONFIG_COMPAT
+               .compatsize     = sizeof(struct compat_xt_mark_info),
+               .compat_from_user = compat_from_user,
+               .compat_to_user = compat_to_user,
+#endif
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "mark",
+               .family         = AF_INET6,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_mark_info),
+               .me             = THIS_MODULE,
+       },
+};
 
-       return ret;
+static int __init xt_mark_init(void)
+{
+       return xt_register_matches(xt_mark_match, ARRAY_SIZE(xt_mark_match));
 }
 
-static void __exit fini(void)
+static void __exit xt_mark_fini(void)
 {
-       xt_unregister_match(AF_INET, &mark_match);
-       xt_unregister_match(AF_INET6, &mark6_match);
+       xt_unregister_matches(xt_mark_match, ARRAY_SIZE(xt_mark_match));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_mark_init);
+module_exit(xt_mark_fini);