Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B7AE7F for ; Tue, 7 Jun 2022 18:03:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E65DCC385A5; Tue, 7 Jun 2022 18:03:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654625008; bh=YfQvhTNtRCQoxAKmCzCkkxrzlP3GHt4D3FPbvmkZ/vM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HyldphA3vaApruQxkBOlDtx1hcu7tyyLvgF+2+f4dtskFIfIDcin/kitBcrnH1MNg Ig3nhKN+eXrjBrDIbygsljUH8Mo3f1rvXT4OqLAjerQF5t48G3GOzQ5rbq522L2FA8 67K+4B012euDB4DkGV9rcB4rwbc32HYowkyquUNk06v0d1cWavWZ3xkJpOTlqamBcB 6ZJ2PuKkhRCqk8Nip4S7RNZMGCZmD1k1sotS0n7miaH/HYgkH4JZhbjO++5yopmhyS i+hJSQ8nejksFCfm7Hg0iOdgBOAuXdl310h72jgT8oH+NCWVmWxkMZSj530z41djNf 6zN0Fa+L5jq3w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Duoming Zhou , Greg Kroah-Hartman , Sasha Levin , baihaowen@meizu.com, dan.carpenter@oracle.com, edumazet@google.com, dave@stgolabs.net, len.baker@gmx.com, wjsota@gmail.com, yangyingliang@huawei.com, linux-staging@lists.linux.dev Subject: [PATCH AUTOSEL 4.9 05/19] drivers: staging: rtl8192e: Fix deadlock in rtllib_beacons_stop() Date: Tue, 7 Jun 2022 14:03:00 -0400 Message-Id: <20220607180317.482354-5-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607180317.482354-1-sashal@kernel.org> References: <20220607180317.482354-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Duoming Zhou [ Upstream commit 9b6bdbd9337de3917945847bde262a34a87a6303 ] There is a deadlock in rtllib_beacons_stop(), which is shown below: (Thread 1) | (Thread 2) | rtllib_send_beacon() rtllib_beacons_stop() | mod_timer() spin_lock_irqsave() //(1) | (wait a time) ... | rtllib_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, rtllib_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/20220417141641.124388-1-duoming@zju.edu.cn Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index da74dc49b95e..f46def63967b 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -655,9 +655,9 @@ static void rtllib_beacons_stop(struct rtllib_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); } -- 2.35.1