mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 09:30:52 +07:00
netfilter: xt_hashlimit: fix race between htable_destroy and htable_gc
Deleting a timer with del_timer doesn't guarantee, that the timer function is not running at the moment of deletion. Thus in the xt_hashlimit case we can get into a ticklish situation when the htable_gc rearms the timer back and we'll actually delete an entry with a pending timer. Fix it with using del_timer_sync(). AFAIK del_timer_sync checks for the timer to be pending by itself, so I remove the check. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a8ddc9163c
commit
967ab999a0
@ -367,9 +367,7 @@ static void htable_gc(unsigned long htlong)
|
||||
|
||||
static void htable_destroy(struct xt_hashlimit_htable *hinfo)
|
||||
{
|
||||
/* remove timer, if it is pending */
|
||||
if (timer_pending(&hinfo->timer))
|
||||
del_timer(&hinfo->timer);
|
||||
del_timer_sync(&hinfo->timer);
|
||||
|
||||
/* remove proc entry */
|
||||
remove_proc_entry(hinfo->pde->name,
|
||||
|
Loading…
Reference in New Issue
Block a user