diff options
| author | jeff <jeff@FreeBSD.org> | 2007-10-09 00:03:39 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2007-10-09 00:03:39 +0000 |
| commit | 8f126294e75c3487485d20d180e0758cdfafccbd (patch) | |
| tree | d3b60df86f091c4f7d499c7f53be5d15c3aa6b98 /sys/kern/sys_process.c | |
| parent | 2bbd1c2e708382ee1b19c674a8652704a90aa976 (diff) | |
| download | FreeBSD-src-8f126294e75c3487485d20d180e0758cdfafccbd.zip FreeBSD-src-8f126294e75c3487485d20d180e0758cdfafccbd.tar.gz | |
- Fix from pr kern/115469; Don't redeliver a signal once it has been
handled by the target process.
Contributed by: Tijl Coosemans <tijl@ulyssis.org>
Approved by: re
Diffstat (limited to 'sys/kern/sys_process.c')
| -rw-r--r-- | sys/kern/sys_process.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index bb441ee..ff9640a 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -779,14 +779,15 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) sx_xunlock(&proctree_lock); proctree_locked = 0; } - /* deliver or queue signal */ - thread_lock(td2); - td2->td_flags &= ~TDF_XSIG; - thread_unlock(td2); - td2->td_xsig = data; p->p_xstat = data; p->p_xthread = NULL; if ((p->p_flag & (P_STOPPED_SIG | P_STOPPED_TRACE)) != 0) { + /* deliver or queue signal */ + thread_lock(td2); + td2->td_flags &= ~TDF_XSIG; + thread_unlock(td2); + td2->td_xsig = data; + PROC_SLOCK(p); if (req == PT_DETACH) { struct thread *td3; @@ -809,11 +810,10 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) p->p_flag &= ~(P_STOPPED_TRACE|P_STOPPED_SIG|P_WAITED); thread_unsuspend(p); PROC_SUNLOCK(p); + } else { + if (data) + psignal(p, data); } - - if (data) - psignal(p, data); - break; case PT_WRITE_I: |
