diff options
| author | attilio <attilio@FreeBSD.org> | 2012-09-08 18:35:15 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2012-09-08 18:35:15 +0000 |
| commit | 7f498fac4af60ae0a9278ccffe36bed96963ea3d (patch) | |
| tree | 98f5b33ba4f4ae11a422f2464f4573c7357e5bd2 /sys/kern/subr_trap.c | |
| parent | 1e61b37b3fa32dbd38244eaef86701972d1c07fc (diff) | |
| download | FreeBSD-src-7f498fac4af60ae0a9278ccffe36bed96963ea3d.zip FreeBSD-src-7f498fac4af60ae0a9278ccffe36bed96963ea3d.tar.gz | |
Move the checks for td_pinned, td_critnest, TDP_NOFAULTING and
TDP_NOSLEEPING leaking from syscallret() to userret() so that also
trap handling is covered. Also, the check on td_locks is not duplicated
between the two functions.
Reported by: avg
Reviewed by: kib
MFC after: 1 week
Diffstat (limited to 'sys/kern/subr_trap.c')
| -rw-r--r-- | sys/kern/subr_trap.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 1dc0b9c09..24960fd 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -139,8 +139,21 @@ userret(struct thread *td, struct trapframe *frame) #ifdef XEN PT_UPDATES_FLUSH(); #endif + + /* + * Check for misbehavior. + */ + WITNESS_WARN(WARN_PANIC, NULL, "userret: returning"); + KASSERT(td->td_critnest == 0, + ("userret: Returning in a critical section")); KASSERT(td->td_locks == 0, - ("userret: Returning with %d locks held.", td->td_locks)); + ("userret: Returning with %d locks held", td->td_locks)); + KASSERT((td->td_pflags & TDP_NOFAULTING) == 0, + ("userret: Returning with pagefaults disabled")); + KASSERT((td->td_pflags & TDP_NOSLEEPING) == 0, + ("userret: Returning with sleep disabled")); + KASSERT(td->td_pinned == 0, + ("userret: Returning with with pinned thread")); #ifdef VIMAGE /* Unfortunately td_vnet_lpush needs VNET_DEBUG. */ VNET_ASSERT(curvnet == NULL, |
