kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86_64 ia32 ptrace: convert to compat_arch_ptrace

Browse source 
Now that there are no more special cases in sys32_ptrace, we
can convert to using the generic compat_sys_ptrace entry point.
The sys32_ptrace function gets simpler and becomes compat_arch_ptrace.

Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Roland McGrath 2008-04-22 12:21:25 -07:00 committed by Ingo Molnar
parent cdb6990479
commit 562b80baff
3 changed files with 11 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/ia32/ia32entry.S
View file

@ -430,7 +430,7 @@ ia32_sys_call_table:
.quad sys_setuid16 .quad sys_setuid16
.quad sys_getuid16 .quad sys_getuid16
.quad compat_sys_stime /* stime */ /* 25 */ .quad compat_sys_stime /* stime */ /* 25 */
.quad sys32_ptrace /* ptrace */ .quad compat_sys_ptrace /* ptrace */
.quad sys_alarm .quad sys_alarm
.quad sys_fstat /* (old)fstat */ .quad sys_fstat /* (old)fstat */
.quad sys_pause .quad sys_pause

67
arch/x86/kernel/ptrace.c
View file

@ -1207,68 +1207,15 @@ static int genregs32_set(struct task_struct *target,
return ret; return ret;
} }
asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data) long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
compat_ulong_t caddr, compat_ulong_t cdata)
{ {
struct task_struct *child; unsigned long addr = caddr;
struct pt_regs *childregs; unsigned long data = cdata;
void __user *datap = compat_ptr(data); void __user *datap = compat_ptr(data);
int ret; int ret;
__u32 val; __u32 val;
switch (request) {
case PTRACE_TRACEME:
case PTRACE_ATTACH:
case PTRACE_KILL:
case PTRACE_CONT:
case PTRACE_SINGLESTEP:
case PTRACE_SINGLEBLOCK:
case PTRACE_DETACH:
case PTRACE_SYSCALL:
case PTRACE_OLDSETOPTIONS:
case PTRACE_SETOPTIONS:
case PTRACE_SET_THREAD_AREA:
case PTRACE_GET_THREAD_AREA:
#ifdef X86_BTS
case PTRACE_BTS_CONFIG:
case PTRACE_BTS_STATUS:
case PTRACE_BTS_SIZE:
case PTRACE_BTS_GET:
case PTRACE_BTS_CLEAR:
case PTRACE_BTS_DRAIN:
#endif
return sys_ptrace(request, pid, addr, data);
default:
return -EINVAL;
case PTRACE_PEEKTEXT:
case PTRACE_PEEKDATA:
case PTRACE_POKEDATA:
case PTRACE_POKETEXT:
case PTRACE_POKEUSR:
case PTRACE_PEEKUSR:
case PTRACE_GETREGS:
case PTRACE_SETREGS:
case PTRACE_SETFPREGS:
case PTRACE_GETFPREGS:
case PTRACE_SETFPXREGS:
case PTRACE_GETFPXREGS:
case PTRACE_GETEVENTMSG:
case PTRACE_SETSIGINFO:
case PTRACE_GETSIGINFO:
break;
}
child = ptrace_get_task_struct(pid);
if (IS_ERR(child))
return PTR_ERR(child);
ret = ptrace_check_attach(child, request == PTRACE_KILL);
if (ret < 0)
goto out;
childregs = task_pt_regs(child);
switch (request) { switch (request) {
case PTRACE_PEEKUSR: case PTRACE_PEEKUSR:
ret = getreg32(child, addr, &val); ret = getreg32(child, addr, &val);
@ -1315,12 +1262,14 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)
sizeof(struct user32_fxsr_struct), sizeof(struct user32_fxsr_struct),
datap); datap);
case PTRACE_GET_THREAD_AREA:
case PTRACE_SET_THREAD_AREA:
return arch_ptrace(child, request, addr, data);
default: default:
return compat_ptrace_request(child, request, addr, data); return compat_ptrace_request(child, request, addr, data);
} }
out:
put_task_struct(child);
return ret; return ret;
} }

2
include/asm-x86/ptrace.h
View file

@ -231,6 +231,8 @@ extern int do_get_thread_area(struct task_struct *p, int idx,
extern int do_set_thread_area(struct task_struct *p, int idx, extern int do_set_thread_area(struct task_struct *p, int idx,
struct user_desc __user *info, int can_allocate); struct user_desc __user *info, int can_allocate);
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */