diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-08-30 15:46:13 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-08-30 15:46:13 +0200 |
| commit | bb9fc37358ffa9de1cc2b2b6f1a559b926ef50d9 (patch) | |
| tree | 14a1f7bad41e2a6ad00673f20f268a84627254fc | |
| parent | 4a5cc84ae7e19fb7a72a30332ba67af43e0ad1ad (diff) | |
| download | kernel-common-bb9fc37358ffa9de1cc2b2b6f1a559b926ef50d9.tar.gz kernel-common-bb9fc37358ffa9de1cc2b2b6f1a559b926ef50d9.tar.bz2 kernel-common-bb9fc37358ffa9de1cc2b2b6f1a559b926ef50d9.zip | |
netfilter: nf_ct_tcp: wrong multiplication of TCPOLEN_TSTAMP_ALIGNED in tcp_sack skips fastpath
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>
| -rw-r--r-- | 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 afc4ab7cfe01..8235b86b4e87 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) |