diff options
| author |   cheloha <cheloha@openbsd.org> | 2020-10-23 20:28:09 +0000 |
|---|---|---|
| committer | cheloha <cheloha@openbsd.org> | 2020-10-23 20:28:09 +0000 |
| commit | 2e62301fbfbeb80fedfc5f1bfac4017d3be2df19 (patch) | |
| tree | d8c8ac3e51c72ca191e6fe73a14dc9bb3e2de070 /sys/kern | |
| parent | Don't panic on curlen == 0. This DIAGNOSTIC code should have been removed (diff) | |
| download | wireguard-openbsd-2e62301fbfbeb80fedfc5f1bfac4017d3be2df19.tar.xz wireguard-openbsd-2e62301fbfbeb80fedfc5f1bfac4017d3be2df19.zip | |
sleep_setup_timeout(): always KASSERT that P_TIMEOUT is unset
Even if we aren't setting a timeout, P_TIMEOUT should not be set at
this point in the sleep.
ok visa@
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_synch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 6d65d7fee19..f0338e8f90f 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_synch.c,v 1.170 2020/04/06 07:52:12 claudio Exp $ */ +/* $OpenBSD: kern_synch.c,v 1.171 2020/10/23 20:28:09 cheloha Exp $ */ /* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /* @@ -434,8 +434,9 @@ sleep_setup_timeout(struct sleep_state *sls, int timo) { struct proc *p = curproc; + KASSERT((p->p_flag & P_TIMEOUT) == 0); + if (timo) { - KASSERT((p->p_flag & P_TIMEOUT) == 0); sls->sls_timeout = 1; timeout_add(&p->p_sleep_to, timo); } |