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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9133DCCA481 for ; Tue, 7 Jun 2022 18:23:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350362AbiFGSXI (ORCPT ); Tue, 7 Jun 2022 14:23:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351276AbiFGSSs (ORCPT ); Tue, 7 Jun 2022 14:18:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9E88C4E91; Tue, 7 Jun 2022 10:53:31 -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 dfw.source.kernel.org (Postfix) with ESMTPS id A84F1617A5; Tue, 7 Jun 2022 17:53:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B220C3411F; Tue, 7 Jun 2022 17:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654624411; bh=ux7IuVmMI8o15RzsRZcZNkGPWCqiFNkdIdCURxZuwdY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QNM/Vvgy+zaeZP0/7NxLJBnkiBrvwnyfBb9lc/bMw3lScP2qoHNAk1WHV/BkVeEio Zx5GIe3nFZaHLbA7+42TIe9dD0ShlS69kNAUbgd6na/o66o5MXaEeINZkuln+fVHY/ sagsv6OtnDrUhkxpJ4ViXdLTNvou4oLQDLNmF6zSMm2q2eYux3HxxJqSJ7EAg1qRUw PyI2oVBenehAbqy2R6TM+JQCReFQlhedgeylW8vnt+9dQfLNJ64o3Mkul/D16xI7HQ zw9sT1lakKRUohuQ4lE0fJKa47xnw0ARbbMOdGeZq4PWVpT92r5q9N0suHwE2mLyXX 6ExnJ6tZMkRsQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Duoming Zhou , Greg Kroah-Hartman , Sasha Levin , baihaowen@meizu.com, dave@stgolabs.net, wangborong@cdjrlc.com, len.baker@gmx.com, linux-staging@lists.linux.dev Subject: [PATCH AUTOSEL 5.17 10/60] drivers: staging: rtl8192u: Fix deadlock in ieee80211_beacons_stop() Date: Tue, 7 Jun 2022 13:52:07 -0400 Message-Id: <20220607175259.478835-10-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607175259.478835-1-sashal@kernel.org> References: <20220607175259.478835-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Duoming Zhou [ Upstream commit 806c7b53414934ba2a39449b31fd1a038e500273 ] There is a deadlock in ieee80211_beacons_stop(), which is shown below: (Thread 1) | (Thread 2) | ieee80211_send_beacon() ieee80211_beacons_stop() | mod_timer() spin_lock_irqsave() //(1) | (wait a time) ... | ieee80211_send_beacon_cb() del_timer_sync() | spin_lock_irqsave() //(2) (wait timer to stop) | ... We hold ieee->beacon_lock in position (1) of thread 1 and use del_timer_sync() to wait timer to stop, but timer handler also need ieee->beacon_lock in position (2) of thread 2. As a result, ieee80211_beacons_stop() will block forever. This patch extracts del_timer_sync() from the protection of spin_lock_irqsave(), which could let timer handler to obtain the needed lock. Signed-off-by: Duoming Zhou Link: https://lore.kernel.org/r/20220417135407.109536-1-duoming@zju.edu.cn Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c index 1a43979939a8..79f3fbe25556 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c @@ -528,9 +528,9 @@ static void ieee80211_beacons_stop(struct ieee80211_device *ieee) spin_lock_irqsave(&ieee->beacon_lock, flags); ieee->beacon_txing = 0; - del_timer_sync(&ieee->beacon_timer); spin_unlock_irqrestore(&ieee->beacon_lock, flags); + del_timer_sync(&ieee->beacon_timer); } void ieee80211_stop_send_beacons(struct ieee80211_device *ieee) -- 2.35.1