diff options
| author | Alexey Kodanev <alexey.kodanev@oracle.com> | 2017-02-22 13:23:56 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-23 00:35:58 +0300 |
| commit | eee2faabc63d863a129000b698a2bca54dff643d (patch) | |
| tree | 14f835fc3953a86d3bc533d8d918f3664f5365c7 /net | |
| parent | 00355fa5bb89840c48eb11eb6d84c6c3b128a839 (diff) | |
| download | linux-eee2faabc63d863a129000b698a2bca54dff643d.tar.xz | |
tcp: account for ts offset only if tsecr not zero
We can get SYN with zero tsecr, don't apply offset in this case.
Fixes: ee684b6f2830 ("tcp: send packets with a socket timestamp")
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_minisocks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index dff7d2aaf861..7e16243cdb58 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -101,7 +101,8 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb, tcp_parse_options(skb, &tmp_opt, 0, NULL); if (tmp_opt.saw_tstamp) { - tmp_opt.rcv_tsecr -= tcptw->tw_ts_offset; + if (tmp_opt.rcv_tsecr) + tmp_opt.rcv_tsecr -= tcptw->tw_ts_offset; tmp_opt.ts_recent = tcptw->tw_ts_recent; tmp_opt.ts_recent_stamp = tcptw->tw_ts_recent_stamp; paws_reject = tcp_paws_reject(&tmp_opt, th->rst); |