Skip to content

Commit

Permalink
atm: nicstar: Fix possible use-after-free in nicstar_cleanup()
Browse files Browse the repository at this point in the history
[ Upstream commit 34e7434 ]

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>
  • Loading branch information
SamuelZOU authored and gregkh committed Jul 19, 2021
1 parent ed7c373 commit 5b991df
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/atm/nicstar.c
Expand Up @@ -299,7 +299,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);

Expand Down

0 comments on commit 5b991df

Please sign in to comment.