From patchwork Mon May 7 02:24:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Tomt X-Patchwork-Id: 909503 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=tomt.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40fRKc2fN9z9ryk for ; Mon, 7 May 2018 12:25:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751880AbeEGCZE (ORCPT ); Sun, 6 May 2018 22:25:04 -0400 Received: from mail1.ugh.no ([178.79.162.34]:46840 "EHLO mail1.ugh.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751854AbeEGCZD (ORCPT ); Sun, 6 May 2018 22:25:03 -0400 Received: from localhost (localhost [127.0.0.1]) by mail1.ugh.no (Postfix) with ESMTP id 32756240296; Mon, 7 May 2018 04:25:02 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at catastrophix.ugh.no Received: from mail1.ugh.no ([127.0.0.1]) by localhost (catastrophix.ugh.no [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z0LxK-zqO_uE; Mon, 7 May 2018 04:25:01 +0200 (CEST) Received: from localhost.localdomain (unknown [185.176.245.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: andre-git@tomt.net) by mail.ugh.no (Postfix) with ESMTPSA id C214024028B; Mon, 7 May 2018 04:25:00 +0200 (CEST) From: Andre Tomt To: "David S . Miller" , netdev@vger.kernel.org, borisp@mellanox.com, Aviad Yehezkel , Dave Watson Cc: Andre Tomt Subject: [PATCH net] net/tls: Fix connection stall on partial tls record Date: Mon, 7 May 2018 04:24:39 +0200 Message-Id: <20180507022439.265020-1-andre@tomt.net> X-Mailer: git-send-email 2.17.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the case of writing a partial tls record we forgot to clear the ctx->in_tcp_sendpages flag, causing some connections to stall. Fixes: c212d2c7fc47 ("net/tls: Don't recursively call push_record during tls_write_space callbacks") Signed-off-by: Andre Tomt --- net/tls/tls_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index cc03e00785c7..a02ebdfa0675 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -135,6 +135,7 @@ int tls_push_sg(struct sock *sk, offset -= sg->offset; ctx->partially_sent_offset = offset; ctx->partially_sent_record = (void *)sg; + ctx->in_tcp_sendpages = false; return ret; }