From mboxrd@z Thu Jan 1 00:00:00 1970 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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 C0383C43219 for ; Tue, 30 Apr 2019 11:51:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 91C0B20449 for ; Tue, 30 Apr 2019 11:51:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556625115; bh=tAcEByJnxCkvC1bWn5c5HBQRKGIe0XWWjWn+u3L11jY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RjNmx0v5W5p18zD7HBBX/NLAlGd6VOvWLvFtXqvHlxzWkTSq0CrNOK99TIQfNTAJL oWZxQbPSuTIFoWFtZfxn0nISjvfOQGVWmeI5e4YHrn4kUW0o9z2TE3HAAqP16QcDak 1YAC3feBDWHxHvTjFVfPHTDIfgiY15EwHfuPD+Xk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731474AbfD3Lvy (ORCPT ); Tue, 30 Apr 2019 07:51:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:39950 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731460AbfD3Lvv (ORCPT ); Tue, 30 Apr 2019 07:51:51 -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 B852320449; Tue, 30 Apr 2019 11:51:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556625111; bh=tAcEByJnxCkvC1bWn5c5HBQRKGIe0XWWjWn+u3L11jY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zV6og2G201zT+d06A6esI9vJ+njejoDqsGp8ky9dS82qpgJpPeKVQdjQ34Lq+FiFJ dWP33kZ2bUcvHrR/0kqXUXXoQoBO09+pk8zPH3Cji21g5HNkKbXxQSIVBlgDJElQSa eJg7EA3+rzAlWplPlglEYOG6mg2IA+Cmp2pFa2ZQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Kicinski , Dirk van der Merwe , "David S. Miller" Subject: [PATCH 5.0 88/89] net/tls: avoid potential deadlock in tls_set_device_offload_rx() Date: Tue, 30 Apr 2019 13:39:19 +0200 Message-Id: <20190430113613.930256964@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113609.741196396@linuxfoundation.org> References: <20190430113609.741196396@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jakub Kicinski [ Upstream commit 62ef81d5632634d5e310ed25b9b940b2b6612b46 ] If device supports offload, but offload fails tls_set_device_offload_rx() will call tls_sw_free_resources_rx() which (unhelpfully) releases and reacquires the socket lock. For a small fix release and reacquire the device_offload_lock. Fixes: 4799ac81e52a ("tls: Add rx inline crypto offload") Signed-off-by: Jakub Kicinski Reviewed-by: Dirk van der Merwe Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/tls/tls_device.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -884,7 +884,9 @@ int tls_set_device_offload_rx(struct soc goto release_netdev; free_sw_resources: + up_read(&device_offload_lock); tls_sw_free_resources_rx(sk); + down_read(&device_offload_lock); release_ctx: ctx->priv_ctx_rx = NULL; release_netdev: