upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

filt_timerexpire: avoid process lock recursion

Browse source 
(cherry picked from commit 75c5cf7a72)
This commit is contained in:
Konstantin Belousov 2021-04-13 17:25:11 +03:00
parent a753730ca0
commit 107bc3da39
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sys/kern/kern_event.c
View file

@ -161,6 +161,7 @@ static void filt_procdetach(struct knote *kn);
static int filt_proc(struct knote *kn, long hint);
static int filt_fileattach(struct knote *kn);
static void filt_timerexpire(void *knx);
static void filt_timerexpire_l(struct knote *kn, bool proc_locked);
static int filt_timerattach(struct knote *kn);
static void filt_timerdetach(struct knote *kn);
static void filt_timerstart(struct knote *kn, sbintime_t to);
@ -706,21 +707,19 @@ kqtimer_proc_continue(struct proc *p)
TAILQ_FOREACH_SAFE(kc, &p->p_kqtim_stop, link, kc1) {
TAILQ_REMOVE(&p->p_kqtim_stop, kc, link);
if (kc->next <= now)
filt_timerexpire(kc->kn);
filt_timerexpire_l(kc->kn, true);
else
kqtimer_sched_callout(kc);
}
}
static void
filt_timerexpire(void *knx)
filt_timerexpire_l(struct knote *kn, bool proc_locked)
{
struct knote *kn;
struct kq_timer_cb_data *kc;
struct proc *p;
sbintime_t now;
kn = knx;
kc = kn->kn_ptr.p_v;
if ((kn->kn_flags & EV_ONESHOT) != 0 || kc->to == 0) {
@ -742,17 +741,26 @@ filt_timerexpire(void *knx)
*/
p = kc->p;
if (P_SHOULDSTOP(p) || P_KILLED(p)) {
PROC_LOCK(p);
if (!proc_locked)
PROC_LOCK(p);
if (P_SHOULDSTOP(p) || P_KILLED(p)) {
TAILQ_INSERT_TAIL(&p->p_kqtim_stop, kc, link);
PROC_UNLOCK(p);
if (!proc_locked)
PROC_UNLOCK(p);
return;
}
PROC_UNLOCK(p);
if (!proc_locked)
PROC_UNLOCK(p);
}
kqtimer_sched_callout(kc);
}
static void
filt_timerexpire(void *knx)
{
filt_timerexpire_l(knx, false);
}
/*
* data contains amount of time to sleep
*/