summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZou Wei <zou_wei@huawei.com>2021-05-11 09:58:53 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-19 10:44:38 +0300
commitb7ee9ae1e0cf55a037c4a99af2acc5d78cb7802d (patch)
treecf8cf16ed0ef5af93061973766ea3a55b518c01a
parente759ff76ebbbfcdcf83b6634c54dc47828573d8b (diff)
downloadlinux-b7ee9ae1e0cf55a037c4a99af2acc5d78cb7802d.tar.xz
mISDN: fix possible use-after-free in HFC_cleanup()
[ 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>
-rw-r--r--drivers/isdn/hardware/mISDN/hfcpci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 56bd2e9db6ed..e501cb03f211 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -2342,7 +2342,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);
}