netfilter: ecn match fixes and IPv6 capable xtables port
Subsystems (2)
cover netfilter: ecn match fixes and IPv6 capable xtables port
These patches contain two fixes for the ipt_ecn match and an IPv6 capable xtables port. Nothing particulary exciting in the patches, if noone spots any problems I'll push the first two patches to net-2.6 and the third one to net-next-2.6.
iptables patch will follow shortly.
Patrick McHardy (3):
netfilter: ipt_ecn: fix protocol check in ecn_mt_check()
netfilter: ipt_ecn: fix inversion for IP header ECN match
netfilter: xtables: add an IPv6 capable version of the ECN match
include/linux/netfilter/Kbuild | 1 + include/linux/netfilter/xt_ecn.h | 33 +++++++ net/ipv4/netfilter/Kconfig | 9 -- net/ipv4/netfilter/Makefile | 1 - net/ipv4/netfilter/ipt_ecn.c | 128 -------------------------- net/netfilter/Kconfig | 9 ++ net/netfilter/Makefile | 1 + net/netfilter/xt_ecn.c | 187 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 231 insertions(+), 138 deletions(-) create mode 100644 include/linux/netfilter/xt_ecn.h delete mode 100644 net/ipv4/netfilter/ipt_ecn.c create mode 100644 net/netfilter/xt_ecn.c
PATCH 1/3 netfilter: ipt_ecn: fix protocol check in ecn_mt_check()
From: Patrick McHardy <[email protected]>
Check for protocol inversion in ecn_mt_check() and remove the unnecessary runtime check for IPPROTO_TCP in ecn_mt().
--- net/ipv4/netfilter/ipt_ecn.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
net/ipv4/netfilter/ipt_ecn.c +1 -3
@@ -76,8 +76,6 @@ static bool ecn_mt(const struct sk_buff *skb, struct xt_action_param *par)return false;if (info->operation & (IPT_ECN_OP_MATCH_ECE |IPT_ECN_OP_MATCH_CWR )) { -if (ip_hdr (skb)->protocol !=IPPROTO_TCP ) -return false;if (!match_tcp (skb, info, &par->hotdrop))return false; }
@@ -97,7 +95,7 @@ static int ecn_mt_check(const struct xt_mtchk_param *par)return -EINVAL ;if (info->operation & (IPT_ECN_OP_MATCH_ECE |IPT_ECN_OP_MATCH_CWR ) && - ip->proto !=IPPROTO_TCP ) { + (ip->proto !=IPPROTO_TCP || ip->invflags &IPT_INV_PROTO )) {pr_info ("cannot match TCP bits in rule for non-tcp packets\n" );return -EINVAL ; }
Signature · 1 line
1.7.4.1
PATCH 2/3 netfilter: ipt_ecn: fix inversion for IP header ECN match
In reply to [email protected]From: Patrick McHardy <[email protected]>
Userspace allows to specify inversion for IP header ECN matches, the kernel silently accepts it, but doesn't invert the match result.
--- net/ipv4/netfilter/ipt_ecn.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
net/ipv4/netfilter/ipt_ecn.c +2 -1
@@ -25,7 +25,8 @@ MODULE_LICENSE("GPL");static inline bool match_ip (const struct sk_buff *skb,const struct ipt_ecn_info *einfo) { -return (ip_hdr (skb)->tos &IPT_ECN_IP_MASK ) == einfo->ip_ect; +return ((ip_hdr (skb)->tos &IPT_ECN_IP_MASK ) == einfo->ip_ect) ^ + !!(einfo->invert &IPT_ECN_OP_MATCH_IP ); } static inline bool match_tcp(const struct sk_buff *skb,
Signature · 1 line
1.7.4.1
PATCH 3/3 netfilter: xtables: add an IPv6 capable version of the ECN match
In reply to [email protected]From: Patrick McHardy <[email protected]>
--- include/linux/netfilter/Kbuild | 1 + include/linux/netfilter/xt_ecn.h | 33 +++++++ net/ipv4/netfilter/Kconfig | 9 -- net/ipv4/netfilter/Makefile | 1 - net/ipv4/netfilter/ipt_ecn.c | 127 -------------------------- net/netfilter/Kconfig | 9 ++ net/netfilter/Makefile | 1 + net/netfilter/xt_ecn.c | 187 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 231 insertions(+), 137 deletions(-) create mode 100644 include/linux/netfilter/xt_ecn.h delete mode 100644 net/ipv4/netfilter/ipt_ecn.c create mode 100644 net/netfilter/xt_ecn.c
include/linux/netfilter/Kbuild +1 -0
@@ -40,6 +40,7 @@ header-y += xt_cpu.h header-y += xt_dccp.h header-y += xt_devgroup.h header-y += xt_dscp.h +header-y += xt_ecn.h header-y += xt_esp.h header-y += xt_hashlimit.h header-y += xt_helper.h
include/linux/netfilter/xt_ecn.h new file +33 -0
@@ -0,0 +1,33 @@ +/* iptables module for matching the ECN header in IPv4 and TCP header +* +* (C) 2002 Harald Welte <[email protected]> +* +* This software is distributed under GNU GPL v2, 1991 +*/ +#ifndef _XT_ECN_H +#define _XT_ECN_H + +#include <linux/types.h> +#include <linux/netfilter/xt_dscp.h> + +#define XT_ECN_IP_MASK (~XT_DSCP_MASK) + +#define XT_ECN_OP_MATCH_IP 0x01 +#define XT_ECN_OP_MATCH_ECE 0x10 +#define XT_ECN_OP_MATCH_CWR 0x20 + +#define XT_ECN_OP_MATCH_MASK 0xce + +/* match info */ +struct xt_ecn_info { +__u8 operation; +__u8 invert; +__u8 ip_ect; +union { +struct { +__u8 ect; + } tcp; + } proto; +}; + +#endif /* _XT_ECN_H */
net/ipv4/netfilter/Kconfig +0 -9
@@ -73,15 +73,6 @@ config IP_NF_MATCH_AH To compile it as a module, choose M here. If unsure, say N. -config IP_NF_MATCH_ECN - tristate '"ecn" match support' - depends on NETFILTER_ADVANCED - help - This option adds a `ECN' match, which allows you to match against - the IPv4 and TCP header ECN fields. - - To compile it as a module, choose M here. If unsure, say N. - config IP_NF_MATCH_TTL tristate '"ttl" match support' depends on NETFILTER_ADVANCED
net/ipv4/netfilter/Makefile +0 -1
@@ -49,7 +49,6 @@ obj-$(CONFIG_IP_NF_SECURITY) += iptable_security.o # matches obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o -obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o # targets obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
net/ipv4/netfilter/ipt_ecn.c deleted +0 -127
127 lines not on this page · raw message
net/netfilter/Kconfig +9 -0
@@ -772,6 +772,15 @@ config NETFILTER_XT_MATCH_DSCP To compile it as a module, choose M here. If unsure, say N. +config NETFILTER_XT_MATCH_ECN + tristate '"ecn" match support' + depends on NETFILTER_ADVANCED + help + This option adds a `ECN' match, which allows you to match against + the IPv4/IPv6 and TCP header ECN fields. + + To compile it as a module, choose M here. If unsure, say N. + config NETFILTER_XT_MATCH_ESP tristate '"esp" match support' depends on NETFILTER_ADVANCED
net/netfilter/Makefile +1 -0
@@ -78,6 +78,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNLIMIT) += xt_connlimit.o obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRACK) += xt_conntrack.o obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) += xt_cpu.o obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o +obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
net/netfilter/xt_ecn.c new file +187 -0
187 lines not on this page · raw message
Signature · 1 line
1.7.4.1
Quoted 11 lines · On Thursday 2011-06-09 14:12, [email protected] wrote:
These patches contain two fixes for the
ipt_ecnmatch and an IPv6 capable xtables port. Nothing particulary exciting in the patches, if noone spots any problems I'll push the first two patches to net-2.6 and the third one to net-next-2.6.iptables patch will follow shortly.
Patrick McHardy (3):
netfilter:ipt_ecn: fix protocol check inecn_mt_check()
netfilter:ipt_ecn: fix inversion for IP header ECN match
netfilter: xtables: add an IPv6 capable version of the ECN match
Do you have these in a git:// tree handy? I would like to see if the automatic move detection still kicks in (since it has a 50% threshold). The raw non-move change could have been split otherwise.
Quoted 9 lines · Jan Engelhardt
Quoted 7 lines · On Thursday 2011-06-09 14:12, [email protected] wrote:
These patches contain two fixes for the
ipt_ecnmatch and an IPv6 capable xtables port. Nothing particulary exciting in the patches, if noone spots any problems I'll push the first two patches to net-2.6 and the third one to net-next-2.6.iptables patch will follow shortly.
Quoted 9 lines
Quoted 4 lines
Patrick McHardy (3):
netfilter:ipt_ecn: fix protocol check inecn_mt_check()
netfilter:ipt_ecn: fix inversion for IP header ECN match
netfilter: xtables: add an IPv6 capable version of the ECN matchDo you have these in a
git://tree handy? I would like to see if the automatic move detection still kicks in (since it has a 50% threshold). The raw non-move change could have been split otherwise.
I pushed them out to
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-testing.git
Quoted 15 lines · Patrick McHardy
Quoted 14 lines · Jan Engelhardt
Quoted 11 lines · On Thursday 2011-06-09 14:12, [email protected] wrote:
These patches contain two fixes for the
ipt_ecnmatch and an IPv6 capable xtables port. Nothing particulary exciting in the patches, if noone spots any problems I'll push the first two patches to net-2.6 and the third one to net-next-2.6.iptables patch will follow shortly.
Patrick McHardy (3):
netfilter:ipt_ecn: fix protocol check inecn_mt_check()
netfilter:ipt_ecn: fix inversion for IP header ECN match
netfilter: xtables: add an IPv6 capable version of the ECN match
Quoted 6 lines
Quoted 3 lines
Do you have these in a
git://tree handy? I would like to see if the automatic move detection still kicks in (since it has a 50% threshold). The raw non-move change could have been split otherwise.I pushed them out to
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-testing.git
I have an alternate patch approach based upon yours. send-email dump following.