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

Fix reporting of having done execve to ptracer

Browse Source
This commit is contained in:
Masamichi Takagi
2014-09-30 13:27:37 +09:00
committed by Tomoki Shirasawa
parent 2997274470
commit 95dd193fd6
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/process.c
View File

@@ -344,7 +344,7 @@ int ptrace_traceme(void){
ihk_mc_spinlock_lock_noirq(&proc->ftn->lock); ihk_mc_spinlock_lock_noirq(&proc->ftn->lock);
proc->ftn->ptrace = PT_TRACED; proc->ftn->ptrace = PT_TRACED | PT_TRACE_EXEC;
proc->ftn->ppid_parent = proc->ftn->parent; proc->ftn->ppid_parent = proc->ftn->parent;
ihk_mc_spinlock_lock_noirq(&proc->ftn->parent->lock); ihk_mc_spinlock_lock_noirq(&proc->ftn->parent->lock);

18
kernel/syscall.c
View File

@@ -1381,6 +1381,7 @@ SYSCALL_DECLARE(arch_prctl)
static int ptrace_report_exec(struct process *proc) static int ptrace_report_exec(struct process *proc)
{ {
dkprintf("ptrace_report_exec,enter\n");
int error = 0; int error = 0;
long rc; long rc;
struct siginfo info; struct siginfo info;
@@ -1388,8 +1389,8 @@ static int ptrace_report_exec(struct process *proc)
if (!(proc->ftn->ptrace & PT_TRACE_EXEC)) { if (!(proc->ftn->ptrace & PT_TRACE_EXEC)) {
goto out; goto out;
} }
/* Save reason why stopped and process state for wait 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); memset(&info, '\0', sizeof info);
info.si_signo = SIGTRAP; info.si_signo = SIGTRAP;
@@ -1399,12 +1400,16 @@ static int ptrace_report_exec(struct process *proc)
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 */ /* Signal myself so that my parent can wait for me */
rc = do_kill(proc->ftn->pid, -1, SIGTRAP, &info); rc = do_kill(proc->ftn->pid, -1, SIGTRAP, &info);
if (rc < 0) { if (rc < 0) {
kprintf("ptrace_report_exec,do_kill failed\n"); kprintf("ptrace_report_exec,do_kill failed\n");
} }
#else
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);
@@ -1416,7 +1421,7 @@ static int ptrace_report_exec(struct process *proc)
info._sifields._sigchld.si_status = PS_TRACED; info._sifields._sigchld.si_status = PS_TRACED;
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_exec,do_kill failed\n"); dkprintf("ptrace_report_exec,do_kill failed\n");
} }
} }
ihk_mc_spinlock_unlock_noirq(&proc->ftn->parent->lock); ihk_mc_spinlock_unlock_noirq(&proc->ftn->parent->lock);
@@ -1424,6 +1429,13 @@ static int ptrace_report_exec(struct process *proc)
/* Wake parent (if sleeping in wait4()) */ /* Wake parent (if sleeping in wait4()) */
waitq_wakeup(&proc->ftn->parent->waitpid_q); waitq_wakeup(&proc->ftn->parent->waitpid_q);
} }
/* Sleep */
dkprintf("ptrace_report_exec,sleeping\n");
proc->status = PS_TRACED;
schedule();
dkprintf("ptrace_report_exec,woken up\n");
out: out:
return error; return error;