From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexey Kodanev Subject: [PATCH 2/2] tcp: account for ts offset only if tsecr not zero Date: Sat, 18 Feb 2017 03:56:12 +0300 Message-ID: <1487379372-28199-2-git-send-email-alexey.kodanev@oracle.com> References: <1487379372-28199-1-git-send-email-alexey.kodanev@oracle.com> Cc: netdev , Florian Westphal , Eric Dumazet , Alexey Kodanev To: David Miller Return-path: Received: from userp1040.oracle.com ([156.151.31.81]:28121 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751616AbdBRAvE (ORCPT ); Fri, 17 Feb 2017 19:51:04 -0500 In-Reply-To: <1487379372-28199-1-git-send-email-alexey.kodanev@oracle.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 --- 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 28ce5ee..baff824 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -106,7 +106,8 @@ enum tcp_tw_status 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); -- 1.7.1