Merge "nf: IDLETIMER: Fix use after free condition during work"

This commit is contained in:
Linux Build Service Account 2016-11-15 04:07:44 -08:00 committed by Gerrit - the friendly Code Review server
commit 126f5e5e99

View file

@ -460,9 +460,9 @@ static void idletimer_tg_destroy(const struct xt_tgdtor_param *par)
list_del(&info->timer->entry);
del_timer_sync(&info->timer->timer);
cancel_work_sync(&info->timer->work);
sysfs_remove_file(idletimer_tg_kobj, &info->timer->attr.attr);
unregister_pm_notifier(&info->timer->pm_nb);
cancel_work_sync(&info->timer->work);
kfree(info->timer->attr.attr.name);
kfree(info->timer);
} else {