From patchwork Mon Jun 1 17:54:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 224931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7769C433E1 for ; Mon, 1 Jun 2020 18:50:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C38CA2068D for ; Mon, 1 Jun 2020 18:50:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037442; bh=Qr5v3sY4zDvVsYmbz2qcrOzPLFgTZAkXnyLn+oMJwXY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FJG2ubncyEGOFcorTQrCkcONNpReyIa/OeC1/Ul+2AjreSuMsxLPPxo6BaurIThF2 Qbj8Bpi0IN4hjZpoAay6yliTsLejuWpiFkcaLlq/Ll0Xim+6ZcXzlmVxoImQ04j7Ms zGAdqXFzqW3qVTIptH5+/hjt0GDz9i3yYes1+49o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730373AbgFASFu (ORCPT ); Mon, 1 Jun 2020 14:05:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:50994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727875AbgFASFq (ORCPT ); Mon, 1 Jun 2020 14:05:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3576E206E2; Mon, 1 Jun 2020 18:05:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034745; bh=Qr5v3sY4zDvVsYmbz2qcrOzPLFgTZAkXnyLn+oMJwXY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o9B/Ob4Lm3XVv5pleDaoV/+oqOiAPF7U9+frl4pc2FO2fSxYMxUjNo7YLBIZf+hiz iVl6LmHYV3EB7++d6fnQGLNMhLxB5q/uVQ0kchWtzRS6+Zu32DXl2MTg7XP0w5/eWo kTDe32cWrCAybonsPBOOJEF15zAxpR/tT2XyUhJ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , Ayush Sawal , Vinay Kumar Yadav , "David S. Miller" Subject: [PATCH 4.19 91/95] crypto: chelsio/chtls: properly set tp->lsndtime Date: Mon, 1 Jun 2020 19:54:31 +0200 Message-Id: <20200601174034.277040237@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174020.759151073@linuxfoundation.org> References: <20200601174020.759151073@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric Dumazet commit a4976a3ef844c510ae9120290b23e9f3f47d6bce upstream. TCP tp->lsndtime unit/base is tcp_jiffies32, not tcp_time_stamp() Fixes: 36bedb3f2e5b ("crypto: chtls - Inline TLS record Tx") Signed-off-by: Eric Dumazet Cc: Ayush Sawal Cc: Vinay Kumar Yadav Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/chelsio/chtls/chtls_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/crypto/chelsio/chtls/chtls_io.c +++ b/drivers/crypto/chelsio/chtls/chtls_io.c @@ -686,7 +686,7 @@ int chtls_push_frames(struct chtls_sock make_tx_data_wr(sk, skb, immdlen, len, credits_needed, completion); tp->snd_nxt += len; - tp->lsndtime = tcp_time_stamp(tp); + tp->lsndtime = tcp_jiffies32; if (completion) ULP_SKB_CB(skb)->flags &= ~ULPCB_FLAG_NEED_HDR; } else {