lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: x86 ptrace arch merge

Browse Source 
This adds 64-bit support to arch_ptrace in arch/x86/kernel/ptrace.c,
so this function can be used for native ptrace on both 32 and 64.

Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Roland McGrath
2008-01-30 13:31:01 +01:00
committed by Ingo Molnar
parent 2047b08be6
commit e9c86c789f
1 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
arch/x86/kernel/ptrace.c
View File

@@ -463,12 +463,13 @@ static int ptrace_set_debugreg(struct task_struct *child,
void ptrace_disable(struct task_struct *child) void ptrace_disable(struct task_struct *child)
{ {
user_disable_single_step(child); user_disable_single_step(child);
#ifdef TIF_SYSCALL_EMU
clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
#endif
} }
long arch_ptrace(struct task_struct *child, long request, long addr, long data) long arch_ptrace(struct task_struct *child, long request, long addr, long data)
{ {
struct user * dummy = NULL;
int i, ret; int i, ret;
unsigned long __user *datap = (unsigned long __user *)data; unsigned long __user *datap = (unsigned long __user *)data;
@@ -484,18 +485,17 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
unsigned long tmp; unsigned long tmp;
ret = -EIO; ret = -EIO;
if ((addr & 3) || addr < 0 || if ((addr & (sizeof(data) - 1)) || addr < 0 ||
addr > sizeof(struct user) - 3) addr >= sizeof(struct user))
break; break;
tmp = 0; /* Default return condition */ tmp = 0; /* Default return condition */
if(addr < FRAME_SIZE*sizeof(long)) if (addr < sizeof(struct user_regs_struct))
tmp = getreg(child, addr); tmp = getreg(child, addr);
if(addr >= (long) &dummy->u_debugreg[0] && else if (addr >= offsetof(struct user, u_debugreg[0]) &&
addr <= (long) &dummy->u_debugreg[7]){ addr <= offsetof(struct user, u_debugreg[7])) {
addr -= (long) &dummy->u_debugreg[0]; addr -= offsetof(struct user, u_debugreg[0]);
addr = addr >> 2; tmp = ptrace_get_debugreg(child, addr / sizeof(data));
tmp = ptrace_get_debugreg(child, addr);
} }
ret = put_user(tmp, datap); ret = put_user(tmp, datap);
break; break;
@@ -509,34 +509,26 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
case PTRACE_POKEUSR: /* write the word at location addr in the USER area */ case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
ret = -EIO; ret = -EIO;
if ((addr & 3) || addr < 0 || if ((addr & (sizeof(data) - 1)) || addr < 0 ||
addr > sizeof(struct user) - 3) addr >= sizeof(struct user))
break; break;
if (addr < FRAME_SIZE*sizeof(long)) { if (addr < sizeof(struct user_regs_struct))
ret = putreg(child, addr, data); ret = putreg(child, addr, data);
break; else if (addr >= offsetof(struct user, u_debugreg[0]) &&
addr <= offsetof(struct user, u_debugreg[7])) {
addr -= offsetof(struct user, u_debugreg[0]);
ret = ptrace_set_debugreg(child,
addr / sizeof(data), data);
} }
/* We need to be very careful here. We implicitly break;
want to modify a portion of the task_struct, and we
have to be selective about what portions we allow someone
to modify. */
ret = -EIO;
if(addr >= (long) &dummy->u_debugreg[0] &&
addr <= (long) &dummy->u_debugreg[7]){
addr -= (long) &dummy->u_debugreg;
addr = addr >> 2;
ret = ptrace_set_debugreg(child, addr, data);
}
break;
case PTRACE_GETREGS: { /* Get all gp regs from the child. */ case PTRACE_GETREGS: { /* Get all gp regs from the child. */
if (!access_ok(VERIFY_WRITE, datap, FRAME_SIZE*sizeof(long))) { if (!access_ok(VERIFY_WRITE, datap, sizeof(struct user_regs_struct))) {
ret = -EIO; ret = -EIO;
break; break;
} }
for ( i = 0; i < FRAME_SIZE*sizeof(long); i += sizeof(long) ) { for (i = 0; i < sizeof(struct user_regs_struct); i += sizeof(long)) {
__put_user(getreg(child, i), datap); __put_user(getreg(child, i), datap);
datap++; datap++;
} }
@@ -546,11 +538,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
case PTRACE_SETREGS: { /* Set all gp regs in the child. */ case PTRACE_SETREGS: { /* Set all gp regs in the child. */
unsigned long tmp; unsigned long tmp;
if (!access_ok(VERIFY_READ, datap, FRAME_SIZE*sizeof(long))) { if (!access_ok(VERIFY_READ, datap, sizeof(struct user_regs_struct))) {
ret = -EIO; ret = -EIO;
break; break;
} }
for ( i = 0; i < FRAME_SIZE*sizeof(long); i += sizeof(long) ) { for (i = 0; i < sizeof(struct user_regs_struct); i += sizeof(long)) {
__get_user(tmp, datap); __get_user(tmp, datap);
putreg(child, i, tmp); putreg(child, i, tmp);
datap++; datap++;
@@ -584,6 +576,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
break; break;
} }
#ifdef CONFIG_X86_32
case PTRACE_GETFPXREGS: { /* Get the child extended FPU state. */ case PTRACE_GETFPXREGS: { /* Get the child extended FPU state. */
if (!access_ok(VERIFY_WRITE, datap, if (!access_ok(VERIFY_WRITE, datap,
sizeof(struct user_fxsr_struct))) { sizeof(struct user_fxsr_struct))) {
@@ -606,7 +599,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
ret = set_fpxregs(child, (struct user_fxsr_struct __user *)data); ret = set_fpxregs(child, (struct user_fxsr_struct __user *)data);
break; break;
} }
#endif
#if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
case PTRACE_GET_THREAD_AREA: case PTRACE_GET_THREAD_AREA:
if (addr < 0) if (addr < 0)
return -EIO; return -EIO;
@@ -620,6 +615,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
ret = do_set_thread_area(child, addr, ret = do_set_thread_area(child, addr,
(struct user_desc __user *) data, 0); (struct user_desc __user *) data, 0);
break; break;
#endif
#ifdef CONFIG_X86_64
/* normal 64bit interface to access TLS data.
Works just like arch_prctl, except that the arguments
are reversed. */
case PTRACE_ARCH_PRCTL:
ret = do_arch_prctl(child, data, addr);
break;
#endif
default: default:
ret = ptrace_request(child, request, addr, data); ret = ptrace_request(child, request, addr, data);