]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
mISDN: fix possible use-after-free in HFC_cleanup()
authorZou Wei <zou_wei@huawei.com>
Tue, 11 May 2021 06:58:53 +0000 (14:58 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jul 2021 06:53:08 +0000 (08:53 +0200)
[ Upstream commit 009fc857c5f6fda81f2f7dd851b2d54193a8e733 ]

This module's remove path calls del_timer(). However, that function
does not wait until the timer handler finishes. This means that the
timer handler may still be running after the driver's remove function
has finished, which would result in a use-after-free.

Fix by calling del_timer_sync(), which makes sure the timer handler
has finished, and unable to re-schedule itself.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zou Wei <zou_wei@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/isdn/hardware/mISDN/hfcpci.c

index 2330a7d24267951de7880bd7d75f48abd3bac940..a2b2ce1dfec81b05e389693d2a97e4c85dddcbed 100644 (file)
@@ -2341,7 +2341,7 @@ static void __exit
 HFC_cleanup(void)
 {
        if (timer_pending(&hfc_tl))
-               del_timer(&hfc_tl);
+               del_timer_sync(&hfc_tl);
 
        pci_unregister_driver(&hfc_driver);
 }