From patchwork Mon Oct 24 11:28:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9484 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp480651wru; Mon, 24 Oct 2022 07:21:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6hpwwDHKbrKzLCN3P0RUiuNqinxOfjDrDC/aPps6VR7FcXf05bqD5Dvx2QL8wt4ZabHWwm X-Received: by 2002:a05:6402:3641:b0:45c:4231:ddcc with SMTP id em1-20020a056402364100b0045c4231ddccmr30571985edb.224.1666621285095; Mon, 24 Oct 2022 07:21:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621285; cv=none; d=google.com; s=arc-20160816; b=PMFQaHSBcrikvL+8bz0FTFKThNBRq1/B00+sa+LTWusJs88ioRPi7VpHd/trmWW8rw EjOwyYtsfMRyVXl8OHd7SOq2r+ocMcEvwq5QiqVYbBqgzjrCAsNGufzpqUKsZfgqIOoW B+Eo6v3ouibPp7t4e2/up4uKHbigt+pitjxnOQ6XXeEFuEfNSgfciJF/2OoRGFLeksaz GIF6ApeImt7PzPhfsHWArzH2Mp5+AhmTp/hr7IY+y9pYj8k05nDpxGssvAZJATJEPNfo uDiA0UXu2anUDy9+pdf5oRqIgEDzSseLtg30dyHJS2ne5wSjOpJNaPR4ZVcqblRB6ymg LB5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JpdVq4gNkwurGSmqYH9Aof38YZcYgwm7+YigtH/JSMI=; b=WMN+7jiAEow0Y/FlPDqRg1hYwZBB6naU1ZZHTeaIjFsO5AzCyIrZz7GYECNJVaARYn r6Gienqn1Kk9U04UHvt9fqnzaPuNRip47z/bFQHTFujoCU0Q/SQOD2zmDoB4kKWR+skb oq1cGWXJEwi92iHZb0sKVfAQMvz/2KBgjvOEp8WanAMtHPYTYsliTlvjOQp0rPo5uvS/ dHqo9eMmvbgFCbZDBaoZtip8iFIQ4ldI0W0mYVu30w3LcycBefsr7a4YP4iXVdb55sg7 wbjaSIGt2o42A8E8mMSNvASJs4SvFh/UyTNJZLAx2Fide9eakxfy7p0VRf9gCLB94eEM XNgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aC7Sgkvu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gb26-20020a170907961a00b0078ddf8926d2si23175999ejc.827.2022.10.24.07.21.01; Mon, 24 Oct 2022 07:21:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aC7Sgkvu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234276AbiJXONH (ORCPT + 99 others); Mon, 24 Oct 2022 10:13:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237093AbiJXOKG (ORCPT ); Mon, 24 Oct 2022 10:10:06 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1466C786B; Mon, 24 Oct 2022 05:52:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 58E36B81913; Mon, 24 Oct 2022 12:40:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB952C433C1; Mon, 24 Oct 2022 12:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615243; bh=C6CwbD+x4Djmkf1hfONC+CIP9Mm3gn2aJ3WQUw0pJs4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aC7SgkvuYPVfNu4SQspHc22WqluYcx4jwCmoXejrqkzfJFuki7eGcBtjdQyeGg4G2 p8Pi4BlcMVpo+5VtEu0/KNn2TEEDvrMveUKxQyKNliepzY1jlYl8jOVBx552a5I+ZC gQ6c4dIKP7NEAglJXV3u6MK+odi5/pTsBc93WOT4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 5.15 177/530] Bluetooth: RFCOMM: Fix possible deadlock on socket shutdown/release Date: Mon, 24 Oct 2022 13:28:41 +0200 Message-Id: <20221024113053.033911746@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747579080748825542?= X-GMAIL-MSGID: =?utf-8?q?1747579080748825542?= From: Luiz Augusto von Dentz [ Upstream commit 812e92b824c1db16c9519f8624d48a9901a0d38f ] Due to change to switch to use lock_sock inside rfcomm_sk_state_change the socket shutdown/release procedure can cause a deadlock: rfcomm_sock_shutdown(): lock_sock(); __rfcomm_sock_close(): rfcomm_dlc_close(): __rfcomm_dlc_close(): rfcomm_dlc_lock(); rfcomm_sk_state_change(): lock_sock(); To fix this when the call __rfcomm_sock_close is now done without holding the lock_sock since rfcomm_dlc_lock exists to protect the dlc data there is no need to use lock_sock in that code path. Link: https://lore.kernel.org/all/CAD+dNTsbuU4w+Y_P7o+VEN7BYCAbZuwZx2+tH+OTzCdcZF82YA@mail.gmail.com/ Fixes: b7ce436a5d79 ("Bluetooth: switch to lock_sock in RFCOMM") Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/rfcomm/sock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 4bf4ea6cbb5e..21e24da4847f 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -902,7 +902,10 @@ static int rfcomm_sock_shutdown(struct socket *sock, int how) lock_sock(sk); if (!sk->sk_shutdown) { sk->sk_shutdown = SHUTDOWN_MASK; + + release_sock(sk); __rfcomm_sock_close(sk); + lock_sock(sk); if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime && !(current->flags & PF_EXITING))