Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb9fc373 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik Committed by Patrick McHardy
Browse files

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: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 4a5cc84a

net/netfilter/nf_conntrack_proto_tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -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)