]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - net/netfilter/xt_MARK.c
projects / linux-2.6-omap-h63xx.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
block: add a blk_plug_device_unlocked() that grabs the queue lock
[linux-2.6-omap-h63xx.git] / net / netfilter / xt_MARK.c
diff --git a/net/netfilter/xt_MARK.c b/net/netfilter/xt_MARK.c
index 5bf912120f4805257184b59c1baf68ebc6279b3b..f9ce20b58981c757c85980557a919b276919299e 100644 (file)
--- a/net/netfilter/xt_MARK.c
+++ b/net/netfilter/xt_MARK.c
@@ -1,10 +1,13 @@
-/* This is a module which is used for setting the NFMARK field of an skb. */
-
-/* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
+/*
+ *     xt_MARK - Netfilter module to modify the NFMARK field of an skb
+ *
+ *     (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>
@@ -17,7 +20,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Marc Boucher <marc@mbsi.ca>");
-MODULE_DESCRIPTION("ip[6]tables MARK modification module");
+MODULE_DESCRIPTION("Xtables: packet mark modification");
 MODULE_ALIAS("ipt_MARK");
 MODULE_ALIAS("ip6t_MARK");
 
@@ -33,9 +36,9 @@ mark_tg_v0(struct sk_buff *skb, const struct net_device *in,
 }
 
 static unsigned int
-mark_tg(struct sk_buff *skb, const struct net_device *in,
-        const struct net_device *out, unsigned int hooknum,
-        const struct xt_target *target, const void *targinfo)
+mark_tg_v1(struct sk_buff *skb, const struct net_device *in,
+           const struct net_device *out, unsigned int hooknum,
+           const struct xt_target *target, const void *targinfo)
 {
        const struct xt_mark_target_info_v1 *markinfo = targinfo;
        int mark = 0;
@@ -58,6 +61,17 @@ mark_tg(struct sk_buff *skb, const struct net_device *in,
        return XT_CONTINUE;
 }
 
+static unsigned int
+mark_tg(struct sk_buff *skb, const struct net_device *in,
+        const struct net_device *out, unsigned int hooknum,
+        const struct xt_target *target, const void *targinfo)
+{
+       const struct xt_mark_tginfo2 *info = targinfo;
+
+       skb->mark = (skb->mark & ~info->mask) ^ info->mark;
+       return XT_CONTINUE;
+}
+
 static bool
 mark_tg_check_v0(const char *tablename, const void *entry,
                  const struct xt_target *target, void *targinfo,
@@ -73,9 +87,9 @@ mark_tg_check_v0(const char *tablename, const void *entry,
 }
 
 static bool
-mark_tg_check(const char *tablename, const void *entry,
-              const struct xt_target *target, void *targinfo,
-              unsigned int hook_mask)
+mark_tg_check_v1(const char *tablename, const void *entry,
+                 const struct xt_target *target, void *targinfo,
+                 unsigned int hook_mask)
 {
        const struct xt_mark_target_info_v1 *markinfo = targinfo;
 
@@ -94,6 +108,28 @@ mark_tg_check(const char *tablename, const void *entry,
 }
 
 #ifdef CONFIG_COMPAT
+struct compat_xt_mark_target_info {
+       compat_ulong_t  mark;
+};
+
+static void mark_tg_compat_from_user_v0(void *dst, void *src)
+{
+       const struct compat_xt_mark_target_info *cm = src;
+       struct xt_mark_target_info m = {
+               .mark   = cm->mark,
+       };
+       memcpy(dst, &m, sizeof(m));
+}
+
+static int mark_tg_compat_to_user_v0(void __user *dst, void *src)
+{
+       const struct xt_mark_target_info *m = src;
+       struct compat_xt_mark_target_info cm = {
+               .mark   = m->mark,
+       };
+       return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
+}
+
 struct compat_xt_mark_target_info_v1 {
        compat_ulong_t  mark;
        u_int8_t        mode;
@@ -101,7 +137,7 @@ struct compat_xt_mark_target_info_v1 {
        u_int16_t       __pad2;
 };
 
-static void mark_tg_compat_from_user(void *dst, void *src)
+static void mark_tg_compat_from_user_v1(void *dst, void *src)
 {
        const struct compat_xt_mark_target_info_v1 *cm = src;
        struct xt_mark_target_info_v1 m = {
@@ -111,7 +147,7 @@ static void mark_tg_compat_from_user(void *dst, void *src)
        memcpy(dst, &m, sizeof(m));
 }
 
-static int mark_tg_compat_to_user(void __user *dst, void *src)
+static int mark_tg_compat_to_user_v1(void __user *dst, void *src)
 {
        const struct xt_mark_target_info_v1 *m = src;
        struct compat_xt_mark_target_info_v1 cm = {
@@ -130,6 +166,11 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
                .checkentry     = mark_tg_check_v0,
                .target         = mark_tg_v0,
                .targetsize     = sizeof(struct xt_mark_target_info),
+#ifdef CONFIG_COMPAT
+               .compatsize     = sizeof(struct compat_xt_mark_target_info),
+               .compat_from_user = mark_tg_compat_from_user_v0,
+               .compat_to_user = mark_tg_compat_to_user_v0,
+#endif
                .table          = "mangle",
                .me             = THIS_MODULE,
        },
@@ -137,13 +178,13 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
                .name           = "MARK",
                .family         = AF_INET,
                .revision       = 1,
-               .checkentry     = mark_tg_check,
-               .target         = mark_tg,
+               .checkentry     = mark_tg_check_v1,
+               .target         = mark_tg_v1,
                .targetsize     = sizeof(struct xt_mark_target_info_v1),
 #ifdef CONFIG_COMPAT
                .compatsize     = sizeof(struct compat_xt_mark_target_info_v1),
-               .compat_from_user = mark_tg_compat_from_user,
-               .compat_to_user = mark_tg_compat_to_user,
+               .compat_from_user = mark_tg_compat_from_user_v1,
+               .compat_to_user = mark_tg_compat_to_user_v1,
 #endif
                .table          = "mangle",
                .me             = THIS_MODULE,
@@ -155,6 +196,11 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
                .checkentry     = mark_tg_check_v0,
                .target         = mark_tg_v0,
                .targetsize     = sizeof(struct xt_mark_target_info),
+#ifdef CONFIG_COMPAT
+               .compatsize     = sizeof(struct compat_xt_mark_target_info),
+               .compat_from_user = mark_tg_compat_from_user_v0,
+               .compat_to_user = mark_tg_compat_to_user_v0,
+#endif
                .table          = "mangle",
                .me             = THIS_MODULE,
        },
@@ -162,17 +208,33 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
                .name           = "MARK",
                .family         = AF_INET6,
                .revision       = 1,
-               .checkentry     = mark_tg_check,
-               .target         = mark_tg,
+               .checkentry     = mark_tg_check_v1,
+               .target         = mark_tg_v1,
                .targetsize     = sizeof(struct xt_mark_target_info_v1),
 #ifdef CONFIG_COMPAT
                .compatsize     = sizeof(struct compat_xt_mark_target_info_v1),
-               .compat_from_user = mark_tg_compat_from_user,
-               .compat_to_user = mark_tg_compat_to_user,
+               .compat_from_user = mark_tg_compat_from_user_v1,
+               .compat_to_user = mark_tg_compat_to_user_v1,
 #endif
                .table          = "mangle",
                .me             = THIS_MODULE,
        },
+       {
+               .name           = "MARK",
+               .revision       = 2,
+               .family         = AF_INET,
+               .target         = mark_tg,
+               .targetsize     = sizeof(struct xt_mark_tginfo2),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "MARK",
+               .revision       = 2,
+               .family         = AF_INET6,
+               .target         = mark_tg,
+               .targetsize     = sizeof(struct xt_mark_tginfo2),
+               .me             = THIS_MODULE,
+       },
 };
 
 static int __init mark_tg_init(void)
Unnamed repository; edit this file 'description' to name the repository.