[NETFILTER]: xt_mark match, revision 1

Introduces the xt_mark match revision 1. It uses fixed types,
eventually obsoleting revision 0 some day (uses nonfixed types).

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netfilter/xt_mark.h b/include/linux/netfilter/xt_mark.h
index 802dd4842cafa95e74684c9e6b1983f58fce49a0..fae74bc3f34e753b342391f4dd58e664a932c268 100644 (file)
--- a/include/linux/netfilter/xt_mark.h
+++ b/include/linux/netfilter/xt_mark.h
@@ -6,4 +6,9 @@ struct xt_mark_info {
     u_int8_t invert;
 };
 
+struct xt_mark_mtinfo1 {
+       u_int32_t mark, mask;
+       u_int8_t invert;
+};
+
 #endif /*_XT_MARK_H*/

diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
index ce8735e9762779d51575826f4bc32e513459b639..5cc8cc57c722c886010dca8a22d3969f25330da9 100644 (file)
--- a/net/netfilter/xt_mark.c
+++ b/net/netfilter/xt_mark.c
@@ -1,10 +1,13 @@
-/* Kernel module to match NFMARK values. */
-
-/* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
+/*
+ *     xt_mark - Netfilter module to match NFMARK value
+ *
+ *     (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
+ *     Copyright © CC Computer Consultants GmbH, 2007 - 2008
+ *     Jan Engelhardt <jengelh@computergmbh.de>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License version 2 as
+ *     published by the Free Software Foundation.
  */
 
 #include <linux/module.h>
@@ -19,20 +22,31 @@ MODULE_DESCRIPTION("iptables mark matching module");
 MODULE_ALIAS("ipt_mark");
 MODULE_ALIAS("ip6t_mark");
 
+static bool
+mark_mt_v0(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)
+{
+       const struct xt_mark_info *info = matchinfo;
+
+       return ((skb->mark & info->mask) == info->mark) ^ info->invert;
+}
+
 static bool
 mark_mt(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)
 {
-       const struct xt_mark_info *info = matchinfo;
+       const struct xt_mark_mtinfo1 *info = matchinfo;
 
        return ((skb->mark & info->mask) == info->mark) ^ info->invert;
 }
 
 static bool
-mark_mt_check(const char *tablename, const void *entry,
-              const struct xt_match *match, void *matchinfo,
-              unsigned int hook_mask)
+mark_mt_check_v0(const char *tablename, const void *entry,
+                 const struct xt_match *match, void *matchinfo,
+                 unsigned int hook_mask)
 {
        const struct xt_mark_info *minfo = matchinfo;
 
@@ -51,7 +65,7 @@ struct compat_xt_mark_info {
        u_int16_t       __pad2;
 };
 
-static void mark_mt_compat_from_user(void *dst, void *src)
+static void mark_mt_compat_from_user_v0(void *dst, void *src)
 {
        const struct compat_xt_mark_info *cm = src;
        struct xt_mark_info m = {
@@ -62,7 +76,7 @@ static void mark_mt_compat_from_user(void *dst, void *src)
        memcpy(dst, &m, sizeof(m));
 }
 
-static int mark_mt_compat_to_user(void __user *dst, void *src)
+static int mark_mt_compat_to_user_v0(void __user *dst, void *src)
 {
        const struct xt_mark_info *m = src;
        struct compat_xt_mark_info cm = {
@@ -77,30 +91,48 @@ static int mark_mt_compat_to_user(void __user *dst, void *src)
 static struct xt_match mark_mt_reg[] __read_mostly = {
        {
                .name           = "mark",
+               .revision       = 0,
                .family         = AF_INET,
-               .checkentry     = mark_mt_check,
-               .match          = mark_mt,
+               .checkentry     = mark_mt_check_v0,
+               .match          = mark_mt_v0,
                .matchsize      = sizeof(struct xt_mark_info),
 #ifdef CONFIG_COMPAT
                .compatsize     = sizeof(struct compat_xt_mark_info),
-               .compat_from_user = mark_mt_compat_from_user,
-               .compat_to_user = mark_mt_compat_to_user,
+               .compat_from_user = mark_mt_compat_from_user_v0,
+               .compat_to_user = mark_mt_compat_to_user_v0,
 #endif
                .me             = THIS_MODULE,
        },
        {
                .name           = "mark",
+               .revision       = 0,
                .family         = AF_INET6,
-               .checkentry     = mark_mt_check,
-               .match          = mark_mt,
+               .checkentry     = mark_mt_check_v0,
+               .match          = mark_mt_v0,
                .matchsize      = sizeof(struct xt_mark_info),
 #ifdef CONFIG_COMPAT
                .compatsize     = sizeof(struct compat_xt_mark_info),
-               .compat_from_user = mark_mt_compat_from_user,
-               .compat_to_user = mark_mt_compat_to_user,
+               .compat_from_user = mark_mt_compat_from_user_v0,
+               .compat_to_user = mark_mt_compat_to_user_v0,
 #endif
                .me             = THIS_MODULE,
        },
+       {
+               .name           = "mark",
+               .revision       = 1,
+               .family         = AF_INET,
+               .match          = mark_mt,
+               .matchsize      = sizeof(struct xt_mark_mtinfo1),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "mark",
+               .revision       = 1,
+               .family         = AF_INET6,
+               .match          = mark_mt,
+               .matchsize      = sizeof(struct xt_mark_mtinfo1),
+               .me             = THIS_MODULE,
+       },
 };
 
 static int __init mark_mt_init(void)