summaryrefslogtreecommitdiffstats
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 09:44:38 +0200
commita7f7c42e31157d1f0871d6a8e1a0b73a6b4ea785 (patch)
treef87492343c80fd6d698eb5595e75a93f3ba60645 /drivers/atm
parentb7ee9ae1e0cf55a037c4a99af2acc5d78cb7802d (diff)
downloadlinux-stable-a7f7c42e31157d1f0871d6a8e1a0b73a6b4ea785.tar.gz
linux-stable-a7f7c42e31157d1f0871d6a8e1a0b73a6b4ea785.tar.bz2
linux-stable-a7f7c42e31157d1f0871d6a8e1a0b73a6b4ea785.zip
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 09ad73361879..1351b05a3097 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);