From patchwork Tue Oct 27 13:44:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 312288 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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 1AB9FC5DF9D for ; Tue, 27 Oct 2020 16:36:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CEACA21655 for ; Tue, 27 Oct 2020 16:36:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603816589; bh=xyi1kZoxi62/ou7uYIIQuK5NO3LHkBoAObP+ddndtds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zoZGrIPpMeF/WkLBA0oH8Ra3BuwZL+tRLgDUGDi9inuG2WxKOGLCG01XvHoQvROjx zmEOt9rQSkmCxbXK6dIyMGltW/4NoGyi63TWv3SdkMkGz9VN6lKn4JLaSf3ofXsHzf 4+mVwQd8jWM2KXJ0ih6gnGgM3KVX1UXOXq0nlJzY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1800537AbgJ0Pr6 (ORCPT ); Tue, 27 Oct 2020 11:47:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:56312 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1796456AbgJ0PSq (ORCPT ); Tue, 27 Oct 2020 11:18:46 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 E75422064B; Tue, 27 Oct 2020 15:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811926; bh=xyi1kZoxi62/ou7uYIIQuK5NO3LHkBoAObP+ddndtds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tPy9uP8USS+yRlcaKTZgnRdfNEEI/5OoiejxlrQeDXlnwOVGZYgxPZJYrOYiqfgkV ul1UCLfWM3n3CvJ0Y4589yDG85qxgG4cO3J8xSosY2r9NMruPorbPtVS/CuLUxMygk SHjf3xnGVFBy64i2EnS8xzGv48WQp/oFpgj3BoV8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vinay Kumar Yadav , Jakub Kicinski Subject: [PATCH 5.9 031/757] chelsio/chtls: fix socket lock Date: Tue, 27 Oct 2020 14:44:41 +0100 Message-Id: <20201027135451.982295986@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vinay Kumar Yadav [ Upstream commit 0fb5f0160a36d7acaa8e84ce873af99f94b60484 ] In chtls_sendpage() socket lock is released but not acquired, fix it by taking lock. Fixes: 36bedb3f2e5b ("crypto: chtls - Inline TLS record Tx") Signed-off-by: Vinay Kumar Yadav Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/chelsio/chtls/chtls_io.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/crypto/chelsio/chtls/chtls_io.c +++ b/drivers/crypto/chelsio/chtls/chtls_io.c @@ -1240,6 +1240,7 @@ int chtls_sendpage(struct sock *sk, stru copied = 0; csk = rcu_dereference_sk_user_data(sk); cdev = csk->cdev; + lock_sock(sk); timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT); err = sk_stream_wait_connect(sk, &timeo);