From: kaber@trash.net
To: davem@davemloft.net
Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH 7/8] netfilter: nf_ct_tcp: wrong multiplication of TCPOLEN_TSTAMP_ALIGNED in tcp_sack skips fastpath
Date: Tue, 30 Aug 2011 16:41:20 +0200 [thread overview]
Message-ID: <1314715281-26233-8-git-send-email-kaber@trash.net> (raw)
In-Reply-To: <1314715281-26233-1-git-send-email-kaber@trash.net>
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
The wrong multiplication of TCPOLEN_TSTAMP_ALIGNED by 4 skips the fast path
for the timestamp-only option. Bug reported by Michael M. Builov (netfilter
bugzilla #738).
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
net/netfilter/nf_conntrack_proto_tcp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index afc4ab7..8235b86 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -447,7 +447,7 @@ static void tcp_sack(const struct sk_buff *skb, unsigned int dataoff,
BUG_ON(ptr == NULL);
/* Fast path for timestamp-only option */
- if (length == TCPOLEN_TSTAMP_ALIGNED*4
+ if (length == TCPOLEN_TSTAMP_ALIGNED
&& *(__be32 *)ptr == htonl((TCPOPT_NOP << 24)
| (TCPOPT_NOP << 16)
| (TCPOPT_TIMESTAMP << 8)
--
1.7.2.3
next prev parent reply other threads:[~2011-08-30 14:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-30 14:41 [PATCH 0/8] netfilter: netfilter fixes kaber
2011-08-30 14:41 ` [PATCH 1/8] netfilter: xt_rateest: fix xt_rateest_mt_checkentry() kaber
2011-08-30 14:41 ` [PATCH 2/8] netfilter: ip_queue: Fix small leak in ipq_build_packet_message() kaber
2011-08-30 14:41 ` [PATCH 3/8] netfilter: ebtables: fix ebtables build dependency kaber
2011-08-30 14:41 ` [PATCH 4/8] netfilter: nf_queue: reject NF_STOLEN verdicts from userspace kaber
2011-08-30 14:41 ` [PATCH 5/8] netfilter: nf_ct_pptp: fix DNATed PPTP connection address translation kaber
2011-08-30 14:41 ` [PATCH 6/8] netfilter: nf_ct_tcp: fix incorrect handling of invalid TCP option kaber
2011-08-30 14:41 ` kaber [this message]
2011-08-30 14:41 ` [PATCH 8/8] netfilter: update netfilter git URL kaber
2011-08-30 21:45 ` [PATCH 0/8] netfilter: netfilter fixes 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=1314715281-26233-8-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).