Page MenuHomeFreeBSD
Files F111567679

D32252.id96051.diff
No OneTemporary
Actions

D32252.id96051.diff
View Options

diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -2209,17 +2209,20 @@
return (ret);
} else {
action = SIG_CATCH;
+ intrval = 0;
}
- } else if (SIGISMEMBER(td->td_sigmask, sig))
- action = SIG_HOLD;
- else if (SIGISMEMBER(ps->ps_sigcatch, sig))
- action = SIG_CATCH;
- else
- action = SIG_DFL;
- if (SIGISMEMBER(ps->ps_sigintr, sig))
- intrval = EINTR;
- else
- intrval = ERESTART;
+ } else {
+ if (SIGISMEMBER(td->td_sigmask, sig))
+ action = SIG_HOLD;
+ else if (SIGISMEMBER(ps->ps_sigcatch, sig))
+ action = SIG_CATCH;
+ else
+ action = SIG_DFL;
+ if (SIGISMEMBER(ps->ps_sigintr, sig))
+ intrval = EINTR;
+ else
+ intrval = ERESTART;
+ }
mtx_unlock(&ps->ps_mtx);
if (prop & SIGPROP_CONT)
diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c
--- a/sys/kern/subr_sleepqueue.c
+++ b/sys/kern/subr_sleepqueue.c
@@ -1125,7 +1125,7 @@
THREAD_LOCK_ASSERT(td, MA_OWNED);
MPASS(TD_ON_SLEEPQ(td));
MPASS(td->td_flags & TDF_SINTR);
- MPASS(intrval == EINTR || intrval == ERESTART);
+ MPASS(intrval == 0 || intrval == EINTR || intrval == ERESTART);
/*
* If the TDF_TIMEOUT flag is set, just leave. A

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 6, 9:11 AM (1 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17011784
Default Alt Text
D32252.id96051.diff (1 KB)

Event Timeline