[PATCH 1/3] xt_tos match

[PATCH 1/3] xt_tos match

[Jan Engelhardt]

Posted for review and checkup.

===Patch begins===

Convert ipt_tos to xt_tos, with a few extras:

	* IPv6 support (will use the priority field)

	* allow to match on the full TOS value
	  (i.e. with Network Precedence, if desired)

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>

---
 include/linux/netfilter/Kbuild      |    1 
 include/linux/netfilter/xt_tos.h    |   14 ++++
 include/linux/netfilter_ipv4/Kbuild |    1 
 net/ipv4/netfilter/Kconfig          |    9 ---
 net/ipv4/netfilter/Makefile         |    1 
 net/ipv4/netfilter/ipt_tos.c        |   50 ----------------
 net/netfilter/Kconfig               |   10 +++
 net/netfilter/Makefile              |    1 
 net/netfilter/xt_tos.c              |  106 ++++++++++++++++++++++++++++++++++++
 9 files changed, 132 insertions(+), 61 deletions(-)

Index: net-2.6.25/include/linux/netfilter/Kbuild
===================================================================
--- net-2.6.25.orig/include/linux/netfilter/Kbuild
+++ net-2.6.25/include/linux/netfilter/Kbuild
@@ -35,6 +35,7 @@ header-y += xt_statistic.h
 header-y += xt_string.h
 header-y += xt_tcpmss.h
 header-y += xt_tcpudp.h
+header-y += xt_tos.h
 
 unifdef-y += nf_conntrack_common.h
 unifdef-y += nf_conntrack_ftp.h
Index: net-2.6.25/include/linux/netfilter/xt_tos.h
===================================================================
--- /dev/null
+++ net-2.6.25/include/linux/netfilter/xt_tos.h
@@ -0,0 +1,14 @@
+#ifndef _XT_TOS_MATCH_H
+#define _XT_TOS_MATCH_H
+
+struct xt_tos_match_info {
+	u_int8_t tos_value;
+	u_int8_t tos_mask;
+	u_int8_t invert;
+};
+
+#ifndef IPTOS_NORMALSVC
+#	define IPTOS_NORMALSVC 0
+#endif
+
+#endif /* _XT_TOS_MATCH_H */
Index: net-2.6.25/include/linux/netfilter_ipv4/Kbuild
===================================================================
--- net-2.6.25.orig/include/linux/netfilter_ipv4/Kbuild
+++ net-2.6.25/include/linux/netfilter_ipv4/Kbuild
@@ -40,7 +40,6 @@ header-y += ipt_sctp.h
 header-y += ipt_state.h
 header-y += ipt_string.h
 header-y += ipt_tcpmss.h
-header-y += ipt_tos.h
 header-y += ipt_ttl.h
 
 unifdef-y += ip_queue.h
Index: net-2.6.25/net/ipv4/netfilter/Kconfig
===================================================================
--- net-2.6.25.orig/net/ipv4/netfilter/Kconfig
+++ net-2.6.25/net/ipv4/netfilter/Kconfig
@@ -63,15 +63,6 @@ config IP_NF_MATCH_IPRANGE
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
-config IP_NF_MATCH_TOS
-	tristate "TOS match support"
-	depends on IP_NF_IPTABLES
-	help
-	  TOS matching allows you to match packets based on the Type Of
-	  Service fields of the IP packet.
-
-	  To compile it as a module, choose M here.  If unsure, say N.
-
 config IP_NF_MATCH_RECENT
 	tristate "recent match support"
 	depends on IP_NF_IPTABLES
Index: net-2.6.25/net/ipv4/netfilter/Makefile
===================================================================
--- net-2.6.25.orig/net/ipv4/netfilter/Makefile
+++ net-2.6.25/net/ipv4/netfilter/Makefile
@@ -47,7 +47,6 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
 obj-$(CONFIG_IP_NF_MATCH_IPRANGE) += ipt_iprange.o
 obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o
 obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
-obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
 obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
 
 # targets
Index: net-2.6.25/net/ipv4/netfilter/ipt_tos.c
===================================================================
--- net-2.6.25.orig/net/ipv4/netfilter/ipt_tos.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Kernel module to match TOS values. */
-
-/* (C) 1999-2001 Paul `Rusty' Russell
- * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
- *
- * 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/ip.h>
-#include <linux/module.h>
-#include <linux/skbuff.h>
-
-#include <linux/netfilter_ipv4/ipt_tos.h>
-#include <linux/netfilter/x_tables.h>
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("iptables TOS match module");
-
-static bool
-tos_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 ipt_tos_info *info = matchinfo;
-
-	return (ip_hdr(skb)->tos == info->tos) ^ info->invert;
-}
-
-static struct xt_match tos_mt_reg __read_mostly = {
-	.name		= "tos",
-	.family		= AF_INET,
-	.match		= tos_mt,
-	.matchsize	= sizeof(struct ipt_tos_info),
-	.me		= THIS_MODULE,
-};
-
-static int __init tos_mt_init(void)
-{
-	return xt_register_match(&tos_mt_reg);
-}
-
-static void __exit tos_mt_exit(void)
-{
-	xt_unregister_match(&tos_mt_reg);
-}
-
-module_init(tos_mt_init);
-module_exit(tos_mt_exit);
Index: net-2.6.25/net/netfilter/Kconfig
===================================================================
--- net-2.6.25.orig/net/netfilter/Kconfig
+++ net-2.6.25/net/netfilter/Kconfig
@@ -679,6 +679,16 @@ config NETFILTER_XT_MATCH_TIME
 	  If you want to compile it as a module, say M here.
 	  If unsure, say N.
 
+config NETFILTER_XT_MATCH_TOS
+	tristate '"tos" match support'
+	depends on NETFILTER_XTABLES
+	---help---
+	TOS matching allows you to match packets based on the Type Of
+	Service field of the IPv4 packet or Traffic Class field of
+	the IPv6 packet.
+
+	To compile it as a module, choose M here. If unsure, say N.
+
 config NETFILTER_XT_MATCH_U32
 	tristate '"u32" match support'
 	depends on NETFILTER_XTABLES
Index: net-2.6.25/net/netfilter/Makefile
===================================================================
--- net-2.6.25.orig/net/netfilter/Makefile
+++ net-2.6.25/net/netfilter/Makefile
@@ -77,4 +77,5 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTI
 obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
+obj-$(CONFIG_NETFILTER_XT_MATCH_TOS) += xt_tos.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
Index: net-2.6.25/net/netfilter/xt_tos.c
===================================================================
--- /dev/null
+++ net-2.6.25/net/netfilter/xt_tos.c
@@ -0,0 +1,106 @@
+/* Kernel module to match TOS values. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ * © 2007 CC Computer Consultants GmbH
+ * Contact: <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.
+ */
+
+#include <linux/ip.h>
+#include <linux/ipv6.h>
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter/xt_tos.h>
+#include <linux/netfilter_ipv4/ipt_tos.h>
+
+static bool
+tos_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 ipt_tos_info *info = matchinfo;
+
+	return (ip_hdr(skb)->tos == info->tos) ^ info->invert;
+}
+
+static bool
+tos_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_tos_match_info *info = matchinfo;
+
+	if (match->family == AF_INET)
+		return ((ip_hdr(skb)->tos & info->tos_mask) ==
+		       info->tos_value) ^ info->invert;
+	else
+		return ((ipv6_hdr(skb)->priority & info->tos_mask) ==
+		       info->tos_value) ^ info->invert;
+}
+
+static bool
+tos_mt6_check(const char *tablename, const void *ip,
+              const struct xt_match *match, void *matchinfo,
+              unsigned int hook_mask)
+{
+	const struct xt_tos_match_info *info = matchinfo;
+
+	if (info->tos_mask > 0xF || info->tos_value > 0xF) {
+		printk(KERN_WARNING KBUILD_MODNAME
+		       ": Traffic Class field may only take values 0-15\n");
+		return false;
+	}
+
+	return true;
+}
+
+static struct xt_match tos_mt_reg[] __read_mostly = {
+	{
+		.name       = "tos",
+		.revision   = 0,
+		.family     = AF_INET,
+		.match      = tos_mt_v0,
+		.matchsize  = sizeof(struct ipt_tos_info),
+		.me         = THIS_MODULE,
+	},
+	{
+		.name       = "tos",
+		.revision   = 1,
+		.family     = AF_INET,
+		.match      = tos_mt,
+		.matchsize  = sizeof(struct xt_tos_match_info),
+		.me         = THIS_MODULE,
+	},
+	{
+		.name       = "tos",
+		.revision   = 1,
+		.family     = AF_INET6,
+		.match      = tos_mt,
+		.matchsize  = sizeof(struct xt_tos_match_info),
+		.checkentry = tos_mt6_check,
+		.me         = THIS_MODULE,
+	},
+};
+
+static int __init tos_mt_init(void)
+{
+	return xt_register_matches(tos_mt_reg, ARRAY_SIZE(tos_mt_reg));
+}
+
+static void __exit tos_mt_exit(void)
+{
+	xt_unregister_matches(tos_mt_reg, ARRAY_SIZE(tos_mt_reg));
+}
+
+module_init(tos_mt_init);
+module_exit(tos_mt_exit);
+MODULE_DESCRIPTION("netfilter \"tos\" match module");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_tos");
+MODULE_ALIAS("ip6t_tos");

-
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/3] xt_TOS target

[Jan Engelhardt]

Posted for review and checkup.

===Patch begins===

Convert ipt_TOS to xt_TOS, with the following extras:

	* IPv6 support (will use the priority field)

	* can set network precedence

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>

---
 include/linux/netfilter/Kbuild      |    1 
 include/linux/netfilter/xt_TOS.h    |   13 ++
 include/linux/netfilter_ipv4/Kbuild |    1 
 net/ipv4/netfilter/Kconfig          |   10 --
 net/ipv4/netfilter/Makefile         |    1 
 net/ipv4/netfilter/ipt_TOS.c        |   82 ------------------
 net/netfilter/Kconfig               |    8 +
 net/netfilter/Makefile              |    1 
 net/netfilter/xt_TOS.c              |  160 ++++++++++++++++++++++++++++++++++++
 9 files changed, 183 insertions(+), 94 deletions(-)

Index: net-2.6.25/include/linux/netfilter/Kbuild
===================================================================
--- net-2.6.25.orig/include/linux/netfilter/Kbuild
+++ net-2.6.25/include/linux/netfilter/Kbuild
@@ -12,6 +12,7 @@ header-y += xt_NFLOG.h
 header-y += xt_NFQUEUE.h
 header-y += xt_SECMARK.h
 header-y += xt_TCPMSS.h
+header-y += xt_TOS.h
 header-y += xt_comment.h
 header-y += xt_connbytes.h
 header-y += xt_connmark.h
Index: net-2.6.25/include/linux/netfilter/xt_TOS.h
===================================================================
--- /dev/null
+++ net-2.6.25/include/linux/netfilter/xt_TOS.h
@@ -0,0 +1,13 @@
+#ifndef _XT_TOS_TARGET_H
+#define _XT_TOS_TARGET_H
+
+#ifndef IPTOS_NORMALSVC
+#	define IPTOS_NORMALSVC 0
+#endif
+
+struct xt_tos_target_info {
+	u_int8_t tos_value;
+	u_int8_t tos_mask;
+};
+
+#endif /* _XT_TOS_TARGET_H */
Index: net-2.6.25/include/linux/netfilter_ipv4/Kbuild
===================================================================
--- net-2.6.25.orig/include/linux/netfilter_ipv4/Kbuild
+++ net-2.6.25/include/linux/netfilter_ipv4/Kbuild
@@ -9,7 +9,6 @@ header-y += ipt_NFQUEUE.h
 header-y += ipt_REJECT.h
 header-y += ipt_SAME.h
 header-y += ipt_TCPMSS.h
-header-y += ipt_TOS.h
 header-y += ipt_TTL.h
 header-y += ipt_ULOG.h
 header-y += ipt_addrtype.h
Index: net-2.6.25/net/ipv4/netfilter/Kconfig
===================================================================
--- net-2.6.25.orig/net/ipv4/netfilter/Kconfig
+++ net-2.6.25/net/ipv4/netfilter/Kconfig
@@ -302,16 +302,6 @@ config IP_NF_MANGLE
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
-config IP_NF_TARGET_TOS
-	tristate "TOS target support"
-	depends on IP_NF_MANGLE
-	help
-	  This option adds a `TOS' target, which allows you to create rules in
-	  the `mangle' table which alter the Type Of Service field of an IP
-	  packet prior to routing.
-
-	  To compile it as a module, choose M here.  If unsure, say N.
-
 config IP_NF_TARGET_ECN
 	tristate "ECN target support"
 	depends on IP_NF_MANGLE
Index: net-2.6.25/net/ipv4/netfilter/Makefile
===================================================================
--- net-2.6.25.orig/net/ipv4/netfilter/Makefile
+++ net-2.6.25/net/ipv4/netfilter/Makefile
@@ -58,7 +58,6 @@ obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt
 obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
 obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_SAME.o
-obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
 obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
 obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
 
Index: net-2.6.25/net/ipv4/netfilter/ipt_TOS.c
===================================================================
--- net-2.6.25.orig/net/ipv4/netfilter/ipt_TOS.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* This is a module which is used for setting the TOS field of a packet. */
-
-/* (C) 1999-2001 Paul `Rusty' Russell
- * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
- *
- * 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>
-#include <linux/skbuff.h>
-#include <linux/ip.h>
-#include <net/checksum.h>
-
-#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter_ipv4/ipt_TOS.h>
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
-MODULE_DESCRIPTION("iptables TOS mangling module");
-
-static unsigned int
-tos_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 ipt_tos_target_info *tosinfo = targinfo;
-	struct iphdr *iph = ip_hdr(skb);
-
-	if ((iph->tos & IPTOS_TOS_MASK) != tosinfo->tos) {
-		__u8 oldtos;
-		if (!skb_make_writable(skb, sizeof(struct iphdr)))
-			return NF_DROP;
-		iph = ip_hdr(skb);
-		oldtos = iph->tos;
-		iph->tos = (iph->tos & IPTOS_PREC_MASK) | tosinfo->tos;
-		nf_csum_replace2(&iph->check, htons(oldtos), htons(iph->tos));
-	}
-	return XT_CONTINUE;
-}
-
-static bool
-tos_tg_check(const char *tablename, const void *e_void,
-             const struct xt_target *target, void *targinfo,
-             unsigned int hook_mask)
-{
-	const u_int8_t tos = ((struct ipt_tos_target_info *)targinfo)->tos;
-
-	if (tos != IPTOS_LOWDELAY
-	    && tos != IPTOS_THROUGHPUT
-	    && tos != IPTOS_RELIABILITY
-	    && tos != IPTOS_MINCOST
-	    && tos != IPTOS_NORMALSVC) {
-		printk(KERN_WARNING "TOS: bad tos value %#x\n", tos);
-		return false;
-	}
-	return true;
-}
-
-static struct xt_target tos_tg_reg __read_mostly = {
-	.name		= "TOS",
-	.family		= AF_INET,
-	.target		= tos_tg,
-	.targetsize	= sizeof(struct ipt_tos_target_info),
-	.table		= "mangle",
-	.checkentry	= tos_tg_check,
-	.me		= THIS_MODULE,
-};
-
-static int __init tos_tg_init(void)
-{
-	return xt_register_target(&tos_tg_reg);
-}
-
-static void __exit tos_tg_exit(void)
-{
-	xt_unregister_target(&tos_tg_reg);
-}
-
-module_init(tos_tg_init);
-module_exit(tos_tg_exit);
Index: net-2.6.25/net/netfilter/Kconfig
===================================================================
--- net-2.6.25.orig/net/netfilter/Kconfig
+++ net-2.6.25/net/netfilter/Kconfig
@@ -411,6 +411,14 @@ config NETFILTER_XT_TARGET_TCPMSS
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
+config NETFILTER_XT_TARGET_TOS
+	tristate '"TOS" target support'
+	depends on NETFILTER_XTABLES
+	---help---
+	This option adds a "TOS" target, which allows you to create rules in
+	the "mangle" table to alter the Type Of Service field of an IPv4
+	packet or the Traffic Class field of an IPv6 packet prior to routing.
+
 config NETFILTER_XT_MATCH_COMMENT
 	tristate  '"comment" match support'
 	depends on NETFILTER_XTABLES
Index: net-2.6.25/net/netfilter/Makefile
===================================================================
--- net-2.6.25.orig/net/netfilter/Makefile
+++ net-2.6.25/net/netfilter/Makefile
@@ -48,6 +48,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE
 obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
 obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
 obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_TOS) += xt_TOS.o
 obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
 
 # matches
Index: net-2.6.25/net/netfilter/xt_TOS.c
===================================================================
--- /dev/null
+++ net-2.6.25/net/netfilter/xt_TOS.c
@@ -0,0 +1,160 @@
+/* This is a module which is used for setting the TOS field of a packet. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ * © 2007 CC Computer Consultants GmbH <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.
+ */
+
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/ip.h>
+#include <linux/ipv6.h>
+#include <net/checksum.h>
+#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter/xt_TOS.h>
+#include <linux/netfilter_ipv4/ipt_TOS.h>
+
+static unsigned int
+tos_tg4_v0(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 ipt_tos_target_info *info = targinfo;
+	struct iphdr *iph = ip_hdr(skb);
+	u_int8_t old_tos;
+
+	if ((iph->tos & IPTOS_TOS_MASK) == info->tos)
+		return XT_CONTINUE;
+
+	if (!skb_make_writable(skb, sizeof(struct iphdr)))
+		return NF_DROP;
+
+	iph      = ip_hdr(skb);
+	old_tos  = iph->tos;
+	iph->tos = (iph->tos & IPTOS_PREC_MASK) | info->tos;
+	nf_csum_replace2(&iph->check, htons(old_tos), htons(iph->tos));
+	return XT_CONTINUE;
+}
+
+static unsigned int
+tos_tg4(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_tos_target_info *info = targinfo;
+	struct iphdr *iph = ip_hdr(skb);
+	u_int8_t old_tos;
+
+	if (!skb_make_writable(skb, sizeof(struct iphdr)))
+		return NF_DROP;
+
+	iph       = ip_hdr(skb);
+	old_tos   = iph->tos;
+	iph->tos &= info->tos_mask;
+	iph->tos ^= info->tos_value;
+	nf_csum_replace2(&iph->check, htons(old_tos), htons(iph->tos));
+	return XT_CONTINUE;
+}
+
+static unsigned int
+tos_tg6(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_tos_target_info *info = targinfo;
+	struct ipv6hdr *iph = ipv6_hdr(skb);
+
+	if (!skb_make_writable(skb, sizeof(struct ipv6hdr)))
+		return NF_DROP;
+
+	iph            = ipv6_hdr(skb);
+	iph->priority &= info->tos_mask;
+	iph->priority ^= info->tos_value;
+	return XT_CONTINUE;
+}
+
+static bool
+tos_tg4_check_v0(const char *tablename, const void *e_void,
+                 const struct xt_target *target, void *targinfo,
+                 unsigned int hook_mask)
+{
+	const struct ipt_tos_target_info *info = targinfo;
+
+	if ((info->tos & ~IPTOS_TOS_MASK) != 0) {
+		printk(KERN_WARNING KBUILD_MODNAME
+		       ": Bad TOS value %#x\n", info->tos);
+		return false;
+	}
+
+	return true;
+}
+
+static bool
+tos_tg6_check(const char *tablename, const void *e_void,
+              const struct xt_target *target, void *targinfo,
+              unsigned int hook_mask)
+{
+	const struct xt_tos_target_info *info = targinfo;
+
+	if (info->tos_mask > 0xF || info->tos_value > 0xF) {
+		printk(KERN_WARNING KBUILD_MODNAME
+		       ": Traffic Class field may only take values 0-15\n");
+		return false;
+	}
+
+	return true;
+}
+
+static struct xt_target tos_tg_reg[] __read_mostly = {
+	{
+		.name       = "TOS",
+		.revision   = 0,
+		.family     = AF_INET,
+		.target     = tos_tg4_v0,
+		.targetsize = sizeof(struct ipt_tos_target_info),
+		.table      = "mangle",
+		.checkentry = tos_tg4_check_v0,
+		.me         = THIS_MODULE,
+	},
+	{
+		.name       = "TOS",
+		.revision   = 1,
+		.family     = AF_INET,
+		.target     = tos_tg4,
+		.targetsize = sizeof(struct xt_tos_target_info),
+		.table      = "mangle",
+		.me         = THIS_MODULE,
+	},
+	{
+		.name       = "TOS",
+		.revision   = 1,
+		.family     = AF_INET6,
+		.target     = tos_tg6,
+		.targetsize = sizeof(struct xt_tos_target_info),
+		.checkentry = tos_tg6_check,
+		.table      = "mangle",
+		.me         = THIS_MODULE,
+	},
+};
+
+static int __init tos_tg_init(void)
+{
+	return xt_register_targets(tos_tg_reg, ARRAY_SIZE(tos_tg_reg));
+}
+
+static void __exit tos_tg_exit(void)
+{
+	xt_unregister_targets(tos_tg_reg, ARRAY_SIZE(tos_tg_reg));
+}
+
+module_init(tos_tg_init);
+module_exit(tos_tg_exit);
+MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
+MODULE_DESCRIPTION("netfilter \"TOS\" target module");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_TOS");
+MODULE_ALIAS("ip6t_TOS");
-
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3/3] xt_owner match

[Jan Engelhardt]

As with xt_tos and xt_TOS, the old header files are kept for the time,
and we define a revision 0 which is compatible with ipt_tos/ipt_TOS -
same for xt_owner.

===Patch begins===

Convert ipt_owner to xt_owner.

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>

---
 include/linux/netfilter/Kbuild      |    1 
 include/linux/netfilter/xt_owner.h  |   15 ++
 include/linux/netfilter_ipv4/Kbuild |    1 
 include/linux/netfilter_ipv6/Kbuild |    1 
 net/ipv4/netfilter/Kconfig          |    9 -
 net/ipv4/netfilter/Makefile         |    1 
 net/ipv4/netfilter/ipt_owner.c      |   87 ---------------
 net/ipv6/netfilter/Kconfig          |    9 -
 net/ipv6/netfilter/Makefile         |    1 
 net/ipv6/netfilter/ip6t_owner.c     |   87 ---------------
 net/netfilter/Kconfig               |    7 +
 net/netfilter/Makefile              |    1 
 net/netfilter/xt_owner.c            |  205 ++++++++++++++++++++++++++++++++++++
 13 files changed, 229 insertions(+), 196 deletions(-)

Index: net-2.6.25/include/linux/netfilter/Kbuild
===================================================================
--- net-2.6.25.orig/include/linux/netfilter/Kbuild
+++ net-2.6.25/include/linux/netfilter/Kbuild
@@ -27,6 +27,7 @@ header-y += xt_limit.h
 header-y += xt_mac.h
 header-y += xt_mark.h
 header-y += xt_multiport.h
+header-y += xt_owner.h
 header-y += xt_pkttype.h
 header-y += xt_policy.h
 header-y += xt_realm.h
Index: net-2.6.25/include/linux/netfilter/xt_owner.h
===================================================================
--- /dev/null
+++ net-2.6.25/include/linux/netfilter/xt_owner.h
@@ -0,0 +1,15 @@
+#ifndef _XT_OWNER_MATCH_H
+#define _XT_OWNER_MATCH_H
+
+enum {
+	XT_OWNER_UID = 1 << 0,
+	XT_OWNER_GID = 1 << 1,
+};
+
+struct xt_owner_match_info {
+	u_int32_t uid;
+	u_int32_t gid;
+	u_int8_t match, invert;
+};
+
+#endif /* _XT_OWNER_MATCH_H */
Index: net-2.6.25/include/linux/netfilter_ipv4/Kbuild
===================================================================
--- net-2.6.25.orig/include/linux/netfilter_ipv4/Kbuild
+++ net-2.6.25/include/linux/netfilter_ipv4/Kbuild
@@ -29,7 +29,6 @@ header-y += ipt_limit.h
 header-y += ipt_mac.h
 header-y += ipt_mark.h
 header-y += ipt_multiport.h
-header-y += ipt_owner.h
 header-y += ipt_physdev.h
 header-y += ipt_pkttype.h
 header-y += ipt_policy.h
Index: net-2.6.25/include/linux/netfilter_ipv6/Kbuild
===================================================================
--- net-2.6.25.orig/include/linux/netfilter_ipv6/Kbuild
+++ net-2.6.25/include/linux/netfilter_ipv6/Kbuild
@@ -13,7 +13,6 @@ header-y += ip6t_mac.h
 header-y += ip6t_mark.h
 header-y += ip6t_multiport.h
 header-y += ip6t_opts.h
-header-y += ip6t_owner.h
 header-y += ip6t_physdev.h
 header-y += ip6t_policy.h
 header-y += ip6t_rt.h
Index: net-2.6.25/net/ipv4/netfilter/Kconfig
===================================================================
--- net-2.6.25.orig/net/ipv4/netfilter/Kconfig
+++ net-2.6.25/net/ipv4/netfilter/Kconfig
@@ -102,15 +102,6 @@ config IP_NF_MATCH_TTL
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
-config IP_NF_MATCH_OWNER
-	tristate "Owner match support"
-	depends on IP_NF_IPTABLES
-	help
-	  Packet owner matching allows you to match locally-generated packets
-	  based on who created them: the user, group, process or session.
-
-	  To compile it as a module, choose M here.  If unsure, say N.
-
 config IP_NF_MATCH_ADDRTYPE
 	tristate  'address type match support'
 	depends on IP_NF_IPTABLES
Index: net-2.6.25/net/ipv4/netfilter/Makefile
===================================================================
--- net-2.6.25.orig/net/ipv4/netfilter/Makefile
+++ net-2.6.25/net/ipv4/netfilter/Makefile
@@ -45,7 +45,6 @@ obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ip
 obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
 obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
 obj-$(CONFIG_IP_NF_MATCH_IPRANGE) += ipt_iprange.o
-obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o
 obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
 obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
 
Index: net-2.6.25/net/ipv4/netfilter/ipt_owner.c
===================================================================
--- net-2.6.25.orig/net/ipv4/netfilter/ipt_owner.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Kernel module to match various things tied to sockets associated with
-   locally generated outgoing packets. */
-
-/* (C) 2000 Marc Boucher <marc@mbsi.ca>
- *
- * 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>
-#include <linux/skbuff.h>
-#include <linux/file.h>
-#include <linux/rcupdate.h>
-#include <net/sock.h>
-
-#include <linux/netfilter_ipv4/ipt_owner.h>
-#include <linux/netfilter/x_tables.h>
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Marc Boucher <marc@mbsi.ca>");
-MODULE_DESCRIPTION("iptables owner match");
-
-static bool
-owner_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 ipt_owner_info *info = matchinfo;
-
-	if (!skb->sk || !skb->sk->sk_socket || !skb->sk->sk_socket->file)
-		return false;
-
-	if(info->match & IPT_OWNER_UID) {
-		if ((skb->sk->sk_socket->file->f_uid != info->uid) ^
-		    !!(info->invert & IPT_OWNER_UID))
-			return false;
-	}
-
-	if(info->match & IPT_OWNER_GID) {
-		if ((skb->sk->sk_socket->file->f_gid != info->gid) ^
-		    !!(info->invert & IPT_OWNER_GID))
-			return false;
-	}
-
-	return true;
-}
-
-static bool
-owner_mt_check(const char *tablename, const void *ip,
-               const struct xt_match *match, void *matchinfo,
-               unsigned int hook_mask)
-{
-	const struct ipt_owner_info *info = matchinfo;
-
-	if (info->match & (IPT_OWNER_PID|IPT_OWNER_SID|IPT_OWNER_COMM)) {
-		printk("ipt_owner: pid, sid and command matching "
-		       "not supported anymore\n");
-		return false;
-	}
-	return true;
-}
-
-static struct xt_match owner_mt_reg __read_mostly = {
-	.name		= "owner",
-	.family		= AF_INET,
-	.match		= owner_mt,
-	.matchsize	= sizeof(struct ipt_owner_info),
-	.hooks		= (1 << NF_INET_LOCAL_OUT) |
-			  (1 << NF_INET_POST_ROUTING),
-	.checkentry	= owner_mt_check,
-	.me		= THIS_MODULE,
-};
-
-static int __init owner_mt_init(void)
-{
-	return xt_register_match(&owner_mt_reg);
-}
-
-static void __exit owner_mt_exit(void)
-{
-	xt_unregister_match(&owner_mt_reg);
-}
-
-module_init(owner_mt_init);
-module_exit(owner_mt_exit);
Index: net-2.6.25/net/ipv6/netfilter/Kconfig
===================================================================
--- net-2.6.25.orig/net/ipv6/netfilter/Kconfig
+++ net-2.6.25/net/ipv6/netfilter/Kconfig
@@ -89,15 +89,6 @@ config IP6_NF_MATCH_HL
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
-config IP6_NF_MATCH_OWNER
-	tristate "Owner match support"
-	depends on IP6_NF_IPTABLES
-	help
-	  Packet owner matching allows you to match locally-generated packets
-	  based on who created them: the user, group, process or session.
-
-	  To compile it as a module, choose M here.  If unsure, say N.
-
 config IP6_NF_MATCH_IPV6HEADER
 	tristate "IPv6 Extension Headers Match"
 	depends on IP6_NF_IPTABLES
Index: net-2.6.25/net/ipv6/netfilter/Makefile
===================================================================
--- net-2.6.25.orig/net/ipv6/netfilter/Makefile
+++ net-2.6.25/net/ipv6/netfilter/Makefile
@@ -23,7 +23,6 @@ obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl
 obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) += ip6t_ipv6header.o
 obj-$(CONFIG_IP6_NF_MATCH_MH) += ip6t_mh.o
 obj-$(CONFIG_IP6_NF_MATCH_OPTS) += ip6t_hbh.o
-obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o
 obj-$(CONFIG_IP6_NF_MATCH_RT) += ip6t_rt.o
 
 # targets
Index: net-2.6.25/net/ipv6/netfilter/ip6t_owner.c
===================================================================
--- net-2.6.25.orig/net/ipv6/netfilter/ip6t_owner.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Kernel module to match various things tied to sockets associated with
-   locally generated outgoing packets. */
-
-/* (C) 2000-2001 Marc Boucher <marc@mbsi.ca>
- *
- * 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>
-#include <linux/skbuff.h>
-#include <linux/file.h>
-#include <linux/rcupdate.h>
-#include <net/sock.h>
-
-#include <linux/netfilter_ipv6/ip6t_owner.h>
-#include <linux/netfilter_ipv6/ip6_tables.h>
-#include <linux/netfilter/x_tables.h>
-
-MODULE_AUTHOR("Marc Boucher <marc@mbsi.ca>");
-MODULE_DESCRIPTION("IP6 tables owner matching module");
-MODULE_LICENSE("GPL");
-
-
-static bool
-owner_mt6(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 ip6t_owner_info *info = matchinfo;
-
-	if (!skb->sk || !skb->sk->sk_socket || !skb->sk->sk_socket->file)
-		return false;
-
-	if (info->match & IP6T_OWNER_UID)
-		if ((skb->sk->sk_socket->file->f_uid != info->uid) ^
-		    !!(info->invert & IP6T_OWNER_UID))
-			return false;
-
-	if (info->match & IP6T_OWNER_GID)
-		if ((skb->sk->sk_socket->file->f_gid != info->gid) ^
-		    !!(info->invert & IP6T_OWNER_GID))
-			return false;
-
-	return true;
-}
-
-static bool
-owner_mt6_check(const char *tablename, const void *ip,
-                const struct xt_match *match, void *matchinfo,
-                unsigned int hook_mask)
-{
-	const struct ip6t_owner_info *info = matchinfo;
-
-	if (info->match & (IP6T_OWNER_PID | IP6T_OWNER_SID)) {
-		printk("ipt_owner: pid and sid matching "
-		       "not supported anymore\n");
-		return false;
-	}
-	return true;
-}
-
-static struct xt_match owner_mt6_reg __read_mostly = {
-	.name		= "owner",
-	.family		= AF_INET6,
-	.match		= owner_mt6,
-	.matchsize	= sizeof(struct ip6t_owner_info),
-	.hooks		= (1 << NF_INET_LOCAL_OUT) |
-			  (1 << NF_INET_POST_ROUTING),
-	.checkentry	= owner_mt6_check,
-	.me		= THIS_MODULE,
-};
-
-static int __init owner_mt6_init(void)
-{
-	return xt_register_match(&owner_mt6_reg);
-}
-
-static void __exit owner_mt6_exit(void)
-{
-	xt_unregister_match(&owner_mt6_reg);
-}
-
-module_init(owner_mt6_init);
-module_exit(owner_mt6_exit);
Index: net-2.6.25/net/netfilter/Kconfig
===================================================================
--- net-2.6.25.orig/net/netfilter/Kconfig
+++ net-2.6.25/net/netfilter/Kconfig
@@ -554,6 +554,13 @@ config NETFILTER_XT_MATCH_MARK
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
+config NETFILTER_XT_MATCH_OWNER
+	tristate '"owner" match support'
+	depends on NETFILTER_XTABLES
+	---help---
+	Socket owner matching allows you to match locally-generated packets
+	based on who created the socket: the user, group, process or session.
+
 config NETFILTER_XT_MATCH_POLICY
 	tristate 'IPsec "policy" match support'
 	depends on NETFILTER_XTABLES && XFRM
Index: net-2.6.25/net/netfilter/Makefile
===================================================================
--- net-2.6.25.orig/net/netfilter/Makefile
+++ net-2.6.25/net/netfilter/Makefile
@@ -67,6 +67,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_LIMIT) +
 obj-$(CONFIG_NETFILTER_XT_MATCH_MAC) += xt_mac.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_MARK) += xt_mark.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_MULTIPORT) += xt_multiport.o
+obj-$(CONFIG_NETFILTER_XT_MATCH_OWNER) += xt_owner.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_PHYSDEV) += xt_physdev.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_PKTTYPE) += xt_pkttype.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_POLICY) += xt_policy.o
Index: net-2.6.25/net/netfilter/xt_owner.c
===================================================================
--- /dev/null
+++ net-2.6.25/net/netfilter/xt_owner.c
@@ -0,0 +1,205 @@
+/* Kernel module to match various things tied to sockets associated with
+   locally generated outgoing packets. */
+
+/*
+ * (C) 2000 Marc Boucher <marc@mbsi.ca>
+ *
+ * Copyright © 2007 CC Computer Consultants GmbH
+ * Contact: <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.
+ */
+
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/file.h>
+#include <net/sock.h>
+#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter/xt_owner.h>
+#include <linux/netfilter_ipv4/ipt_owner.h>
+#include <linux/netfilter_ipv6/ip6t_owner.h>
+
+static bool
+owner_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 ipt_owner_info *info = matchinfo;
+	const struct file *filp;
+
+	if (skb->sk == NULL || skb->sk->sk_socket == NULL)
+		return false;
+
+	filp = skb->sk->sk_socket->file;
+	if (filp == NULL)
+		return false;
+
+	if (info->match & IPT_OWNER_UID)
+		if ((filp->f_uid != info->uid) ^
+		    !!(info->invert & IPT_OWNER_UID))
+			return false;
+
+	if (info->match & IPT_OWNER_GID)
+		if ((filp->f_gid != info->gid) ^
+		    !!(info->invert & IPT_OWNER_GID))
+			return false;
+
+	return true;
+}
+
+static bool
+owner_mt6_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 ip6t_owner_info *info = matchinfo;
+	const struct file *filp;
+
+	if (skb->sk == NULL || skb->sk->sk_socket == NULL)
+		return false;
+
+	filp = skb->sk->sk_socket->file;
+	if (filp == NULL)
+		return false;
+
+	if (info->match & IP6T_OWNER_UID)
+		if ((filp->f_uid != info->uid) ^
+		    !!(info->invert & IP6T_OWNER_UID))
+			return false;
+
+	if (info->match & IP6T_OWNER_GID)
+		if ((filp->f_gid != info->gid) ^
+		    !!(info->invert & IP6T_OWNER_GID))
+			return false;
+
+	return true;
+}
+
+static bool
+owner_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_owner_match_info *info = matchinfo;
+	const struct file *filp;
+
+	if (skb->sk == NULL || skb->sk->sk_socket == NULL)
+		return false;
+
+	filp = skb->sk->sk_socket->file;
+	if (filp == NULL)
+		return false;
+
+	if (info->match & XT_OWNER_UID)
+		if ((filp->f_uid != info->uid) ^
+		    !!(info->invert & XT_OWNER_UID))
+			return false;
+
+	if (info->match & XT_OWNER_GID)
+		if ((filp->f_gid != info->gid) ^
+		    !!(info->invert & XT_OWNER_GID))
+			return false;
+
+	return true;
+}
+
+static bool
+owner_mt_check_v0(const char *tablename, const void *ip,
+                  const struct xt_match *match, void *matchinfo,
+                  unsigned int hook_mask)
+{
+	const struct xt_owner_info *info = matchinfo;
+
+	if (info->match & (IPT_OWNER_PID | IPT_OWNER_SID | IPT_OWNER_COMM)) {
+		printk(KERN_WARNING KBUILD_MODNAME
+		       ": PID, SID and command matching is not "
+		       "supported anymore\n");
+		return false;
+	}
+
+	return true;
+}
+
+static bool
+owner_mt6_check_v0(const char *tablename, const void *ip,
+                   const struct xt_match *match, void *matchinfo,
+                   unsigned int hook_mask)
+{
+	const struct ip6t_owner_info *info = matchinfo;
+
+	if (info->match & (IP6T_OWNER_PID | IP6T_OWNER_SID)) {
+		printk(KERN_WARNING KBUILD_MODNAME
+		       ": PID and SID matching is not supported anymore\n");
+		return false;
+	}
+
+	return true;
+}
+
+static struct xt_match owner_mt_reg[] __read_mostly = {
+	{
+		.name       = "owner",
+		.revision   = 0,
+		.family     = AF_INET,
+		.match      = owner_mt_v0,
+		.matchsize  = sizeof(struct ipt_owner_info),
+		.checkentry = owner_mt_check_v0,
+		.hooks      = (1 << NF_IP_LOCAL_OUT) |
+		              (1 << NF_IP_POST_ROUTING),
+		.me         = THIS_MODULE,
+	},
+	{
+		.name       = "owner",
+		.revision   = 0,
+		.family     = AF_INET6,
+		.match      = owner_mt6_v0,
+		.matchsize  = sizeof(struct ip6t_owner_info),
+		.checkentry = owner_mt6_check_v0,
+		.hooks      = (1 << NF_IP_LOCAL_OUT) |
+		              (1 << NF_IP_POST_ROUTING),
+		.me         = THIS_MODULE,
+	},
+	{
+		.name       = "owner",
+		.revision   = 1,
+		.family     = AF_INET,
+		.match      = owner_mt,
+		.matchsize  = sizeof(struct xt_owner_match_info),
+		.hooks      = (1 << NF_IP_LOCAL_OUT) |
+		              (1 << NF_IP_POST_ROUTING),
+		.me         = THIS_MODULE,
+	},
+	{
+		.name       = "owner",
+		.revision   = 1,
+		.family     = AF_INET6,
+		.match      = owner_mt,
+		.matchsize  = sizeof(struct xt_owner_match_info),
+		.hooks      = (1 << NF_IP_LOCAL_OUT) |
+		              (1 << NF_IP_POST_ROUTING),
+		.me         = THIS_MODULE,
+	},
+};
+
+static int __init owner_mt_init(void)
+{
+	return xt_register_matches(owner_mt_reg, ARRAY_SIZE(owner_mt_reg));
+}
+
+static void __exit owner_mt_exit(void)
+{
+	xt_unregister_matches(owner_mt_reg, ARRAY_SIZE(owner_mt_reg));
+}
+
+module_init(owner_mt_init);
+module_exit(owner_mt_exit);
+MODULE_AUTHOR("Jan Engelhardt <jengelh@computergmbh.de>");
+MODULE_DESCRIPTION("netfilter \"owner\" match module");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ipt_owner");
+MODULE_ALIAS("ip6t_owner");
-
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] xt_tos match

[Patrick McHardy]

Jan Engelhardt wrote:
> Posted for review and checkup.
> 
> Index: net-2.6.25/include/linux/netfilter_ipv4/Kbuild
> ===================================================================
> --- net-2.6.25.orig/include/linux/netfilter_ipv4/Kbuild
> +++ net-2.6.25/include/linux/netfilter_ipv4/Kbuild
> @@ -40,7 +40,6 @@ header-y += ipt_sctp.h
>  header-y += ipt_state.h
>  header-y += ipt_string.h
>  header-y += ipt_tcpmss.h
> -header-y += ipt_tos.h

We still need that file, no?

Otherwise looks fine, thanks.

Re: [PATCH 2/3] xt_TOS target

[Patrick McHardy]

Jan Engelhardt wrote:
> Posted for review and checkup.
> 
> +++ net-2.6.25/include/linux/netfilter/xt_TOS.h
> @@ -0,0 +1,13 @@
> +#ifndef _XT_TOS_TARGET_H
> +#define _XT_TOS_TARGET_H
> +
> +#ifndef IPTOS_NORMALSVC
> +#	define IPTOS_NORMALSVC 0
> +#endif
> +
> +struct xt_tos_target_info {
> +	u_int8_t tos_value;
> +	u_int8_t tos_mask;


Is the mask thing really useful?

> --- net-2.6.25.orig/include/linux/netfilter_ipv4/Kbuild
> +++ net-2.6.25/include/linux/netfilter_ipv4/Kbuild
> @@ -9,7 +9,6 @@ header-y += ipt_NFQUEUE.h
>  header-y += ipt_REJECT.h
>  header-y += ipt_SAME.h
>  header-y += ipt_TCPMSS.h
> -header-y += ipt_TOS.h


We also need to keep this one I think.

Re: [PATCH 1/3] xt_tos match

[Jan Engelhardt]

On Nov 19 2007 11:37, Patrick McHardy wrote:
> Jan Engelhardt wrote:
>> Posted for review and checkup.
>> 
>> Index: net-2.6.25/include/linux/netfilter_ipv4/Kbuild
>> ===================================================================
>> --- net-2.6.25.orig/include/linux/netfilter_ipv4/Kbuild
>> +++ net-2.6.25/include/linux/netfilter_ipv4/Kbuild
>> @@ -40,7 +40,6 @@ header-y += ipt_sctp.h
>>  header-y += ipt_state.h
>>  header-y += ipt_string.h
>>  header-y += ipt_tcpmss.h
>> -header-y += ipt_tos.h
>
> We still need that file, no?

I am not sure, but I think yes it may need to stick a little longer
if you are about to build old iptables.
(I have yet to submit libxt_tos, doh!)

Re: [PATCH 2/3] xt_TOS target

[Jan Engelhardt]

On Nov 19 2007 11:40, Patrick McHardy wrote:
> Jan Engelhardt wrote:
>> Posted for review and checkup.
>> 
>> +++ net-2.6.25/include/linux/netfilter/xt_TOS.h
>> @@ -0,0 +1,13 @@
>> +#ifndef _XT_TOS_TARGET_H
>> +#define _XT_TOS_TARGET_H
>> +
>> +#ifndef IPTOS_NORMALSVC
>> +#	define IPTOS_NORMALSVC 0
>> +#endif
>> +
>> +struct xt_tos_target_info {
>> +	u_int8_t tos_value;
>> +	u_int8_t tos_mask;
>
> Is the mask thing really useful?

Yes, in case you want to modify an existing TOS value, e.g.

	-j TOS --tos 0x08/0x08

Sets Maximize-Throughput (plus whatever other TOS flags are already there).

	-j TOS --tos 0x08/0x18

Sets Maximize-Throughput and clears Minimize-Delay, and keeps other
flags (such as Maximize-Reliability).

Or, should the user desire, change all Min-Delay flows into Max-Thru
and vice-versa:

	-j TOS --tos 0x18/0x00

The mask becomes especially useful since with xt_tos/xt_TOS, you can
also match/set the Precedence (the upper 4 bits of the 8-bit TOS field),
and for that, you need a mask unless you want to touch the lower 4 bits too.

>> --- net-2.6.25.orig/include/linux/netfilter_ipv4/Kbuild
>> +++ net-2.6.25/include/linux/netfilter_ipv4/Kbuild
>> @@ -9,7 +9,6 @@ header-y += ipt_NFQUEUE.h
>>  header-y += ipt_REJECT.h
>>  header-y += ipt_SAME.h
>>  header-y += ipt_TCPMSS.h
>> -header-y += ipt_TOS.h
>
>
> We also need to keep this one I think.
>

Suppose so.


Thanks,
Jan

Re: [PATCH 3/3] xt_owner match

[Patrick McHardy]

Jan Engelhardt wrote:
> As with xt_tos and xt_TOS, the old header files are kept for the time,
> and we define a revision 0 which is compatible with ipt_tos/ipt_TOS -
> same for xt_owner.
> 
> --- net-2.6.25.orig/include/linux/netfilter_ipv4/Kbuild
> +++ net-2.6.25/include/linux/netfilter_ipv4/Kbuild
> @@ -29,7 +29,6 @@ header-y += ipt_limit.h
>  header-y += ipt_mac.h
>  header-y += ipt_mark.h
>  header-y += ipt_multiport.h
> -header-y += ipt_owner.h
>  header-y += ipt_physdev.h
>  header-y += ipt_pkttype.h
>  header-y += ipt_policy.h
> Index: net-2.6.25/include/linux/netfilter_ipv6/Kbuild
> ===================================================================
> --- net-2.6.25.orig/include/linux/netfilter_ipv6/Kbuild
> +++ net-2.6.25/include/linux/netfilter_ipv6/Kbuild
> @@ -13,7 +13,6 @@ header-y += ip6t_mac.h
>  header-y += ip6t_mark.h
>  header-y += ip6t_multiport.h
>  header-y += ip6t_opts.h
> -header-y += ip6t_owner.h
>  header-y += ip6t_physdev.h
>  header-y += ip6t_policy.h
>  header-y += ip6t_rt.h

Please keep both.

> +config NETFILTER_XT_MATCH_OWNER
> +	tristate '"owner" match support'
> +	depends on NETFILTER_XTABLES
> +	---help---
> +	Socket owner matching allows you to match locally-generated packets
> +	based on who created the socket: the user, group, process or session.

Only user and group are supported.

> +#include <linux/module.h>
> +#include <linux/skbuff.h>
> +#include <linux/file.h>
> +#include <net/sock.h>
> +#include <linux/netfilter/x_tables.h>
> +#include <linux/netfilter/xt_owner.h>
> +#include <linux/netfilter_ipv4/ipt_owner.h>
> +#include <linux/netfilter_ipv6/ip6t_owner.h>
> +
> +static bool
> +owner_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 ipt_owner_info *info = matchinfo;
> +	const struct file *filp;
> +
> +	if (skb->sk == NULL || skb->sk->sk_socket == NULL)
> +		return false;
> +
> +	filp = skb->sk->sk_socket->file;
> +	if (filp == NULL)
> +		return false;

What would be nice is to allow matching whether a socket exists,
without UID/GID. I had a patch for this for a long time, but
lost it somewhere.

> +
> +	if (info->match & IPT_OWNER_UID)
> +		if ((filp->f_uid != info->uid) ^
> +		    !!(info->invert & IPT_OWNER_UID))
> +			return false;
> +
> +	if (info->match & IPT_OWNER_GID)
> +		if ((filp->f_gid != info->gid) ^
> +		    !!(info->invert & IPT_OWNER_GID))
> +			return false;
> +
> +	return true;
> +}
> +
> +static struct xt_match owner_mt_reg[] __read_mostly = {
> +	{
> +		.name       = "owner",
> +		.revision   = 0,
> +		.family     = AF_INET,
> +		.match      = owner_mt_v0,
> +		.matchsize  = sizeof(struct ipt_owner_info),
> +		.checkentry = owner_mt_check_v0,
> +		.hooks      = (1 << NF_IP_LOCAL_OUT) |
> +		              (1 << NF_IP_POST_ROUTING),

This needs to use NF_INET_...

Please resend all your patches when you want me to apply them.
Thanks.

Re: [PATCH 3/3] xt_owner match

[Jan Engelhardt]

On Nov 19 2007 16:43, Patrick McHardy wrote:
>
> Please keep both.
>
Right.

>> +config NETFILTER_XT_MATCH_OWNER
>> +	tristate '"owner" match support'
>> +	depends on NETFILTER_XTABLES
>> +	---help---
>> +	Socket owner matching allows you to match locally-generated packets
>> +	based on who created the socket: the user, group, process or session.
>
> Only user and group are supported.
>
>> +	if (skb->sk == NULL || skb->sk->sk_socket == NULL)
>> +		return false;
>> +
>> +	filp = skb->sk->sk_socket->file;
>> +	if (filp == NULL)
>> +		return false;
>
> What would be nice is to allow matching whether a socket exists,
> without UID/GID. I had a patch for this for a long time, but
> lost it somewhere.

Do you mean xt_socket from TPROXY?

>> +static struct xt_match owner_mt_reg[] __read_mostly = {
>> +	{
>> +		.name       = "owner",
>> +		.revision   = 0,
>> +		.family     = AF_INET,
>> +		.match      = owner_mt_v0,
>> +		.matchsize  = sizeof(struct ipt_owner_info),
>> +		.checkentry = owner_mt_check_v0,
>> +		.hooks      = (1 << NF_IP_LOCAL_OUT) |
>> +		              (1 << NF_IP_POST_ROUTING),
>
> This needs to use NF_INET_...
>
> Please resend all your patches when you want me to apply them.
> Thanks.
>

Will do.

Re: [PATCH 3/3] xt_owner match

[Jan Engelhardt]

On Nov 19 2007 17:56, Jan Engelhardt wrote:
>>
>>> +	if (skb->sk == NULL || skb->sk->sk_socket == NULL)
>>> +		return false;
>>> +
>>> +	filp = skb->sk->sk_socket->file;
>>> +	if (filp == NULL)
>>> +		return false;
>>
>> What would be nice is to allow matching whether a socket exists,
>> without UID/GID. I had a patch for this for a long time, but
>> lost it somewhere.
>
>Do you mean xt_socket from TPROXY?

Ah, xt_socket is different. But yeah, what you suggest is already implemented.
It is a matter of adjusting the iptables part now to actually make use
of the feature (to match whether a socket exists, w/o owner/group).

Re: [PATCH 3/3] xt_owner match

[Patrick McHardy]

Jan Engelhardt wrote:
> On Nov 19 2007 16:43, Patrick McHardy wrote:
>
>>> +	filp = skb->sk->sk_socket->file;
>>> +	if (filp == NULL)
>>> +		return false;
>> What would be nice is to allow matching whether a socket exists,
>> without UID/GID. I had a patch for this for a long time, but
>> lost it somewhere.
> 
> Do you mean xt_socket from TPROXY?


Well, xt_socket does a lookup. What my patch did was allow matching
on the existance of a socket related to that packet (simply:
iptables ... -m owner -j .... Your patch actually already allows that,
but doesn't allow inversion for this. But now that you mention it,
I did use it for incoming packets combined with a socket lookup,
its probably not that useful for outgoing packets. It would only
require a single new flag to properly support this though.

Re: [PATCH 3/3] xt_owner match

[Jan Engelhardt]

On Nov 19 2007 18:08, Jan Engelhardt wrote:
>On Nov 19 2007 17:56, Jan Engelhardt wrote:
>>>
>>>> +	if (skb->sk == NULL || skb->sk->sk_socket == NULL)
>>>> +		return false;
>>>> +
>>>> +	filp = skb->sk->sk_socket->file;
>>>> +	if (filp == NULL)
>>>> +		return false;
>>>
>>> What would be nice is to allow matching whether a socket exists,
>>> without UID/GID. I had a patch for this for a long time, but
>>> lost it somewhere.
>>
>>Do you mean xt_socket from TPROXY?
>
>Ah, xt_socket is different. But yeah, what you suggest is already implemented.
>It is a matter of adjusting the iptables part now to actually make use
>of the feature (to match whether a socket exists, w/o owner/group).

Speaking... xt_owner currently has

	.hooks = (1 << NF_INET_LOCAL_OUT) | (1 << NF_INET_POST_ROUTING),

All outgoing packets do have a socket, don't they? So the quest for
"whether a socket exists" implies you want me to add (1 <<
NF_INET_LOCAL_IN), (1 << NF_INET_PRE_ROUTING) and (1 <<
NF_INET_FORWARD) too?


thanks,
Jan

Re: [PATCH 3/3] xt_owner match

[Patrick McHardy]

Jan Engelhardt wrote:
> On Nov 19 2007 18:08, Jan Engelhardt wrote:
>> On Nov 19 2007 17:56, Jan Engelhardt wrote:
>>>>> +	if (skb->sk == NULL || skb->sk->sk_socket == NULL)
>>>>> +		return false;
>>>>> +
>>>>> +	filp = skb->sk->sk_socket->file;
>>>>> +	if (filp == NULL)
>>>>> +		return false;
>>>> What would be nice is to allow matching whether a socket exists,
>>>> without UID/GID. I had a patch for this for a long time, but
>>>> lost it somewhere.
>>> Do you mean xt_socket from TPROXY?
>> Ah, xt_socket is different. But yeah, what you suggest is already implemented.
>> It is a matter of adjusting the iptables part now to actually make use
>> of the feature (to match whether a socket exists, w/o owner/group).
> 
> Speaking... xt_owner currently has
> 
> 	.hooks = (1 << NF_INET_LOCAL_OUT) | (1 << NF_INET_POST_ROUTING),
> 
> All outgoing packets do have a socket, don't they?


Not necessarily, for example forwarded packets that are encapsulated
locally by ipip/ip_gre or IPsec don't have one.

> So the quest for
> "whether a socket exists" implies you want me to add (1 <<
> NF_INET_LOCAL_IN), (1 << NF_INET_PRE_ROUTING) and (1 <<
> NF_INET_FORWARD) too?


No, that would imply a lookup. See my previous mail.