summaryrefslogtreecommitdiff
path: root/drivers/atm
diff options
context:
space:
mode:
authorZou Wei <zou_wei@huawei.com>2021-05-12 15:00:24 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-19 08:53:08 +0200
commitbdf5334250c69fabf555b7322c75249ea7d5f148 (patch)
treeefc8f21541552f940e0c64084f91ffb1469982a1 /drivers/atm
parent3ecd228c636ee17c14662729737fa07242a93cb0 (diff)
atm: nicstar: Fix possible use-after-free in nicstar_cleanup()
[ Upstream commit 34e7434ba4e97f4b85c1423a59b2922ba7dff2ea ] 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>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/nicstar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index bb9835c62641..5ec7b6a60145 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -297,7 +297,7 @@ static void __exit nicstar_cleanup(void)
{
XPRINTK("nicstar: nicstar_cleanup() called.\n");
- del_timer(&ns_timer);
+ del_timer_sync(&ns_timer);
pci_unregister_driver(&nicstar_driver);