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

fix ptrace(PTRACE_PEEKUSER), store register value to *data

Browse Source
This commit is contained in:
Tomoki Shirasawa
2014-10-14 12:47:35 +09:00
parent a150a19393
commit 8a6ffa8542
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/syscall.c
View File

@@ -2399,20 +2399,25 @@ static long ptrace_pokeuser(int pid, long addr, long data)
return rc; return rc;
} }
static long ptrace_peekuser(int pid, long addr) static long ptrace_peekuser(int pid, long addr, long data)
{ {
long rc = -EIO; long rc = -EIO;
struct process *child; struct process *child;
ihk_spinlock_t *savelock; ihk_spinlock_t *savelock;
unsigned long irqstate; unsigned long irqstate;
unsigned long *p = (unsigned long *)data;
if(addr > sizeof(struct user) - 8|| addr < 0) if(addr > sizeof(struct user) - 8|| addr < 0)
return -EFAULT; return -EFAULT;
child = findthread_and_lock(pid, -1, &savelock, &irqstate); child = findthread_and_lock(pid, -1, &savelock, &irqstate);
if (!child) if (!child)
return -ESRCH; return -ESRCH;
if(child->status == PS_TRACED) if(child->status == PS_TRACED){
memcpy(&rc, (char *)child->userp + addr, 8); if(copy_to_user(child, p, (char *)child->userp + addr, 8))
rc = -EFAULT;
else
rc = 0;
}
ihk_mc_spinlock_unlock(savelock, irqstate); ihk_mc_spinlock_unlock(savelock, irqstate);
return rc; return rc;
@@ -2494,7 +2499,7 @@ SYSCALL_DECLARE(ptrace)
dkprintf("PTRACE_GETREGS: data=%p return=%p\n", data, error); dkprintf("PTRACE_GETREGS: data=%p return=%p\n", data, error);
break; break;
case PTRACE_PEEKUSER: case PTRACE_PEEKUSER:
error = ptrace_peekuser(pid, addr); error = ptrace_peekuser(pid, addr, data);
dkprintf("PTRACE_PEEKUSER: addr=%p return=%p\n", addr, error); dkprintf("PTRACE_PEEKUSER: addr=%p return=%p\n", addr, error);
break; break;
case PTRACE_POKEUSER: case PTRACE_POKEUSER: