Skip to content

Commit 9a342d4

Browse files
bluesheep1337gregkh
authored andcommitted
memstick: r592: Fix UAF bug in r592_remove due to race condition
[ Upstream commit 6326442 ] In r592_probe, dev->detect_timer was bound with r592_detect_timer. In r592_irq function, the timer function will be invoked by mod_timer. If we remove the module which will call hantro_release to make cleanup, there may be a unfinished work. The possible sequence is as follows, which will cause a typical UAF bug. Fix it by canceling the work before cleanup in r592_remove. CPU0 CPU1 |r592_detect_timer r592_remove | memstick_free_host| put_device; | kfree(host); | | | queue_work | &host->media_checker //use Signed-off-by: Zheng Wang <zyytlz.wz@163.com> Link: https://lore.kernel.org/r/20230307164338.1246287-1-zyytlz.wz@163.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 110d420 commit 9a342d4

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/memstick/host/r592.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ static void r592_remove(struct pci_dev *pdev)
829829
/* Stop the processing thread.
830830
That ensures that we won't take any more requests */
831831
kthread_stop(dev->io_thread);
832-
832+
del_timer_sync(&dev->detect_timer);
833833
r592_enable_device(dev, false);
834834

835835
while (!error && dev->req) {

0 commit comments

Comments
 (0)