]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
drivers: staging: rtl8192e: Fix deadlock in rtllib_beacons_stop()
authorDuoming Zhou <duoming@zju.edu.cn>
Sun, 17 Apr 2022 14:16:41 +0000 (22:16 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 26 Aug 2022 08:53:03 +0000 (10:53 +0200)
commitb8d70ac7361d65c4e0b1f7fe5edff10ec4d1062a
tree18390dfe945e0499021c44abf2a344ed5c6169ce
parent1e18063a5061879cd92e6e106af502189a679850
drivers: staging: rtl8192e: Fix deadlock in rtllib_beacons_stop()

BugLink: https://bugs.launchpad.net/bugs/1982968
[ 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 <duoming@zju.edu.cn>
Link: https://lore.kernel.org/r/20220417141641.124388-1-duoming@zju.edu.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/staging/rtl8192e/rtllib_softmac.c