From: kaber@trash.net
To: davem@davemloft.net
Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH 4/6] netfilter: ipt_ecn: fix inversion for IP header ECN match
Date: Thu, 16 Jun 2011 21:41:39 +0200 [thread overview]
Message-ID: <1308253301-29894-5-git-send-email-kaber@trash.net> (raw)
In-Reply-To: <1308253301-29894-1-git-send-email-kaber@trash.net>
From: Patrick McHardy <kaber@trash.net>
Userspace allows to specify inversion for IP header ECN matches, the
kernel silently accepts it, but doesn't invert the match result.
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
net/ipv4/netfilter/ipt_ecn.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/ipv4/netfilter/ipt_ecn.c b/net/ipv4/netfilter/ipt_ecn.c
index aaa85be..2b57e52 100644
--- a/net/ipv4/netfilter/ipt_ecn.c
+++ b/net/ipv4/netfilter/ipt_ecn.c
@@ -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,
--
1.7.2.3
next prev parent reply other threads:[~2011-06-16 19:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-16 19:41 [PATCH 0/8] netfilter: netfilter fixes for -rc1 kaber
2011-06-16 19:41 ` [PATCH 1/6] IPVS netns exit causes crash in conntrack kaber
2011-06-16 19:41 ` [PATCH 2/6] netfilter: ip_tables: fix compile with debug kaber
2011-06-16 19:41 ` [PATCH 3/6] netfilter: ipt_ecn: fix protocol check in ecn_mt_check() kaber
2011-06-16 19:41 ` kaber [this message]
2011-06-16 19:41 ` [PATCH 5/6] netfilter: fix looped (broad|multi)cast's MAC handling kaber
2011-06-16 19:41 ` [PATCH 6/6] netfilter: nf_nat: avoid double seq_adjust for loopback kaber
2011-06-17 1:43 ` [PATCH 0/8] netfilter: netfilter fixes for -rc1 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1308253301-29894-5-git-send-email-kaber@trash.net \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).