gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

siginfo.si_status was invalid

Browse Source
This commit is contained in:
Tomoki Shirasawa
2014-10-15 15:27:32 +09:00
parent 8a6ffa8542
commit 8460a7d93e
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/syscall.c
View File

@@ -468,7 +468,7 @@ static int ptrace_report_signal(struct process *proc, struct x86_regs *regs, str
info.si_signo = SIGCHLD; info.si_signo = SIGCHLD;
info.si_code = CLD_TRAPPED; info.si_code = CLD_TRAPPED;
info._sifields._sigchld.si_pid = proc->pid; info._sifields._sigchld.si_pid = proc->pid;
info._sifields._sigchld.si_status = PS_TRACED; info._sifields._sigchld.si_status = proc->ftn->exit_status;
rc = do_kill(proc->ftn->parent->owner->pid, -1, SIGCHLD, &info); rc = do_kill(proc->ftn->parent->owner->pid, -1, SIGCHLD, &info);
if (rc < 0) { if (rc < 0) {
kprintf("ptrace_report_signal,do_kill failed\n"); kprintf("ptrace_report_signal,do_kill failed\n");

14
kernel/syscall.c
View File

@@ -1394,24 +1394,12 @@ static int ptrace_report_exec(struct process *proc)
/* Save reason why stopped and process state for wait4() to reap */ /* Save reason why stopped and process state for wait4() to reap */
ihk_mc_spinlock_lock_noirq(&proc->ftn->lock); ihk_mc_spinlock_lock_noirq(&proc->ftn->lock);
memset(&info, '\0', sizeof info);
info.si_signo = SIGTRAP;
info.si_code = TRAP_TRACE;
proc->ftn->exit_status = (SIGTRAP | (PTRACE_EVENT_EXEC << 8)); proc->ftn->exit_status = (SIGTRAP | (PTRACE_EVENT_EXEC << 8));
/* Transition process state */ /* Transition process state */
proc->ftn->status = PS_TRACED; proc->ftn->status = PS_TRACED;
ihk_mc_spinlock_unlock_noirq(&proc->ftn->lock); ihk_mc_spinlock_unlock_noirq(&proc->ftn->lock);
#if 0 // ??? b48da86357c4853f7dea94f67ec65d75d0502f08
/* Signal myself so that my parent can wait for me */
rc = do_kill(proc->ftn->pid, -1, SIGTRAP, &info);
if (rc < 0) {
kprintf("ptrace_report_exec,do_kill failed\n");
}
#else
dkprintf("ptrace_report_exec,kill SIGCHLD\n"); dkprintf("ptrace_report_exec,kill SIGCHLD\n");
#endif
if (proc->ftn->parent) { if (proc->ftn->parent) {
/* kill SIGCHLD */ /* kill SIGCHLD */
ihk_mc_spinlock_lock_noirq(&proc->ftn->parent->lock); ihk_mc_spinlock_lock_noirq(&proc->ftn->parent->lock);
@@ -1420,7 +1408,7 @@ static int ptrace_report_exec(struct process *proc)
info.si_signo = SIGCHLD; info.si_signo = SIGCHLD;
info.si_code = CLD_TRAPPED; info.si_code = CLD_TRAPPED;
info._sifields._sigchld.si_pid = proc->pid; info._sifields._sigchld.si_pid = proc->pid;
info._sifields._sigchld.si_status = PS_TRACED; info._sifields._sigchld.si_status = proc->ftn->exit_status;
rc = do_kill(proc->ftn->parent->owner->pid, -1, SIGCHLD, &info); rc = do_kill(proc->ftn->parent->owner->pid, -1, SIGCHLD, &info);
if(rc < 0) { if(rc < 0) {
dkprintf("ptrace_report_exec,do_kill failed\n"); dkprintf("ptrace_report_exec,do_kill failed\n");