]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
atm: nicstar: Fix possible use-after-free in nicstar_cleanup()
authorZou Wei <zou_wei@huawei.com>
Wed, 12 May 2021 07:00:24 +0000 (15:00 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jul 2021 06:53:08 +0000 (08:53 +0200)
[ 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>
drivers/atm/nicstar.c

index bb9835c62641532835b454112ad7f5d0da5d2836..5ec7b6a6014538e272fc028d41872baa05eab9b3 100644 (file)
@@ -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);