2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
|
|
|
|
* Licensed under the GPL
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "linux/sched.h"
|
|
|
|
#include "linux/mm.h"
|
|
|
|
#include "linux/errno.h"
|
|
|
|
#include "linux/smp_lock.h"
|
|
|
|
#include "linux/security.h"
|
|
|
|
#include "linux/ptrace.h"
|
|
|
|
#include "linux/audit.h"
|
|
|
|
#ifdef CONFIG_PROC_MM
|
|
|
|
#include "linux/proc_mm.h"
|
|
|
|
#endif
|
|
|
|
#include "asm/ptrace.h"
|
|
|
|
#include "asm/uaccess.h"
|
|
|
|
#include "kern_util.h"
|
|
|
|
#include "skas_ptrace.h"
|
|
|
|
#include "sysdep/ptrace.h"
|
2007-02-10 09:44:30 +00:00
|
|
|
#include "os.h"
|
2005-04-16 22:20:36 +00:00
|
|
|
|
[PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch
s390 needs to change some parts of arch/um/kernel/ptrace.c. Thus, the code
regarding PEEKUSER and POKEUSER are shifted to arch/um/sys-<subarch>/ptrace.c.
Also s390 debug registers need to be updated, when singlestepping is switched
on / off. Thus, setting/resetting of singlestepping is centralized in the new
function set_singlestep(), which also inserts the macro
SUBARCH_SET_SINGLESTEP(mode), if defined.
Finally, s390 has the "ieee_instruction_pointer" in its
registers, which also is allowed to be read via
ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0);
To implement this feature, sys_ptrace inserts the macro
SUBARCH_PTRACE_SPECIAL, if defined.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-07 04:30:46 +00:00
|
|
|
static inline void set_singlestepping(struct task_struct *child, int on)
|
|
|
|
{
|
|
|
|
if (on)
|
|
|
|
child->ptrace |= PT_DTRACE;
|
|
|
|
else
|
|
|
|
child->ptrace &= ~PT_DTRACE;
|
|
|
|
child->thread.singlestep_syscall = 0;
|
|
|
|
|
|
|
|
#ifdef SUBARCH_SET_SINGLESTEPPING
|
2005-05-20 20:59:07 +00:00
|
|
|
SUBARCH_SET_SINGLESTEPPING(child, on);
|
[PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch
s390 needs to change some parts of arch/um/kernel/ptrace.c. Thus, the code
regarding PEEKUSER and POKEUSER are shifted to arch/um/sys-<subarch>/ptrace.c.
Also s390 debug registers need to be updated, when singlestepping is switched
on / off. Thus, setting/resetting of singlestepping is centralized in the new
function set_singlestep(), which also inserts the macro
SUBARCH_SET_SINGLESTEP(mode), if defined.
Finally, s390 has the "ieee_instruction_pointer" in its
registers, which also is allowed to be read via
ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0);
To implement this feature, sys_ptrace inserts the macro
SUBARCH_PTRACE_SPECIAL, if defined.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-07 04:30:46 +00:00
|
|
|
#endif
|
2005-05-20 20:59:07 +00:00
|
|
|
}
|
[PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch
s390 needs to change some parts of arch/um/kernel/ptrace.c. Thus, the code
regarding PEEKUSER and POKEUSER are shifted to arch/um/sys-<subarch>/ptrace.c.
Also s390 debug registers need to be updated, when singlestepping is switched
on / off. Thus, setting/resetting of singlestepping is centralized in the new
function set_singlestep(), which also inserts the macro
SUBARCH_SET_SINGLESTEP(mode), if defined.
Finally, s390 has the "ieee_instruction_pointer" in its
registers, which also is allowed to be read via
ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0);
To implement this feature, sys_ptrace inserts the macro
SUBARCH_PTRACE_SPECIAL, if defined.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-07 04:30:46 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* Called by kernel/ptrace.c when detaching..
|
|
|
|
*/
|
|
|
|
void ptrace_disable(struct task_struct *child)
|
|
|
|
{
|
[PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch
s390 needs to change some parts of arch/um/kernel/ptrace.c. Thus, the code
regarding PEEKUSER and POKEUSER are shifted to arch/um/sys-<subarch>/ptrace.c.
Also s390 debug registers need to be updated, when singlestepping is switched
on / off. Thus, setting/resetting of singlestepping is centralized in the new
function set_singlestep(), which also inserts the macro
SUBARCH_SET_SINGLESTEP(mode), if defined.
Finally, s390 has the "ieee_instruction_pointer" in its
registers, which also is allowed to be read via
ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0);
To implement this feature, sys_ptrace inserts the macro
SUBARCH_PTRACE_SPECIAL, if defined.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-07 04:30:46 +00:00
|
|
|
set_singlestepping(child,0);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
[PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch
s390 needs to change some parts of arch/um/kernel/ptrace.c. Thus, the code
regarding PEEKUSER and POKEUSER are shifted to arch/um/sys-<subarch>/ptrace.c.
Also s390 debug registers need to be updated, when singlestepping is switched
on / off. Thus, setting/resetting of singlestepping is centralized in the new
function set_singlestep(), which also inserts the macro
SUBARCH_SET_SINGLESTEP(mode), if defined.
Finally, s390 has the "ieee_instruction_pointer" in its
registers, which also is allowed to be read via
ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0);
To implement this feature, sys_ptrace inserts the macro
SUBARCH_PTRACE_SPECIAL, if defined.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-07 04:30:46 +00:00
|
|
|
extern int peek_user(struct task_struct * child, long addr, long data);
|
|
|
|
extern int poke_user(struct task_struct * child, long addr, long data);
|
|
|
|
|
2005-11-07 08:59:47 +00:00
|
|
|
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
int i, ret;
|
2006-03-31 10:30:15 +00:00
|
|
|
unsigned long __user *p = (void __user *)(unsigned long)data;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
switch (request) {
|
|
|
|
/* when I and D space are separate, these will need to be fixed. */
|
|
|
|
case PTRACE_PEEKTEXT: /* read word at location addr. */
|
2007-07-17 11:03:43 +00:00
|
|
|
case PTRACE_PEEKDATA:
|
|
|
|
ret = generic_ptrace_peekdata(child, addr, data);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* read the word at location addr in the USER area. */
|
[PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch
s390 needs to change some parts of arch/um/kernel/ptrace.c. Thus, the code
regarding PEEKUSER and POKEUSER are shifted to arch/um/sys-<subarch>/ptrace.c.
Also s390 debug registers need to be updated, when singlestepping is switched
on / off. Thus, setting/resetting of singlestepping is centralized in the new
function set_singlestep(), which also inserts the macro
SUBARCH_SET_SINGLESTEP(mode), if defined.
Finally, s390 has the "ieee_instruction_pointer" in its
registers, which also is allowed to be read via
ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0);
To implement this feature, sys_ptrace inserts the macro
SUBARCH_PTRACE_SPECIAL, if defined.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-07 04:30:46 +00:00
|
|
|
case PTRACE_PEEKUSR:
|
|
|
|
ret = peek_user(child, addr, data);
|
|
|
|
break;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* when I and D space are separate, this will have to be fixed. */
|
|
|
|
case PTRACE_POKETEXT: /* write the word at location addr. */
|
|
|
|
case PTRACE_POKEDATA:
|
2007-07-17 11:03:44 +00:00
|
|
|
ret = generic_ptrace_pokedata(child, addr, data);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
|
[PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch
s390 needs to change some parts of arch/um/kernel/ptrace.c. Thus, the code
regarding PEEKUSER and POKEUSER are shifted to arch/um/sys-<subarch>/ptrace.c.
Also s390 debug registers need to be updated, when singlestepping is switched
on / off. Thus, setting/resetting of singlestepping is centralized in the new
function set_singlestep(), which also inserts the macro
SUBARCH_SET_SINGLESTEP(mode), if defined.
Finally, s390 has the "ieee_instruction_pointer" in its
registers, which also is allowed to be read via
ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0);
To implement this feature, sys_ptrace inserts the macro
SUBARCH_PTRACE_SPECIAL, if defined.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-07 04:30:46 +00:00
|
|
|
ret = poke_user(child, addr, data);
|
|
|
|
break;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
|
|
|
|
case PTRACE_CONT: { /* restart after signal. */
|
|
|
|
ret = -EIO;
|
2005-05-01 15:59:14 +00:00
|
|
|
if (!valid_signal(data))
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
[PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch
s390 needs to change some parts of arch/um/kernel/ptrace.c. Thus, the code
regarding PEEKUSER and POKEUSER are shifted to arch/um/sys-<subarch>/ptrace.c.
Also s390 debug registers need to be updated, when singlestepping is switched
on / off. Thus, setting/resetting of singlestepping is centralized in the new
function set_singlestep(), which also inserts the macro
SUBARCH_SET_SINGLESTEP(mode), if defined.
Finally, s390 has the "ieee_instruction_pointer" in its
registers, which also is allowed to be read via
ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0);
To implement this feature, sys_ptrace inserts the macro
SUBARCH_PTRACE_SPECIAL, if defined.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-07 04:30:46 +00:00
|
|
|
set_singlestepping(child, 0);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (request == PTRACE_SYSCALL) {
|
|
|
|
set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
|
|
|
|
}
|
|
|
|
child->exit_code = data;
|
|
|
|
wake_up_process(child);
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* make the child exit. Best I can do is send it a sigkill.
|
|
|
|
* perhaps it should be put in the status that it wants to
|
|
|
|
* exit.
|
|
|
|
*/
|
|
|
|
case PTRACE_KILL: {
|
|
|
|
ret = 0;
|
|
|
|
if (child->exit_state == EXIT_ZOMBIE) /* already dead */
|
|
|
|
break;
|
|
|
|
|
[PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch
s390 needs to change some parts of arch/um/kernel/ptrace.c. Thus, the code
regarding PEEKUSER and POKEUSER are shifted to arch/um/sys-<subarch>/ptrace.c.
Also s390 debug registers need to be updated, when singlestepping is switched
on / off. Thus, setting/resetting of singlestepping is centralized in the new
function set_singlestep(), which also inserts the macro
SUBARCH_SET_SINGLESTEP(mode), if defined.
Finally, s390 has the "ieee_instruction_pointer" in its
registers, which also is allowed to be read via
ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0);
To implement this feature, sys_ptrace inserts the macro
SUBARCH_PTRACE_SPECIAL, if defined.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-07 04:30:46 +00:00
|
|
|
set_singlestepping(child, 0);
|
2005-04-16 22:20:36 +00:00
|
|
|
child->exit_code = SIGKILL;
|
|
|
|
wake_up_process(child);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case PTRACE_SINGLESTEP: { /* set the trap flag. */
|
|
|
|
ret = -EIO;
|
2005-05-01 15:59:14 +00:00
|
|
|
if (!valid_signal(data))
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
|
[PATCH] uml: S390 preparation, peekusr/pokeusr defined by subarch
s390 needs to change some parts of arch/um/kernel/ptrace.c. Thus, the code
regarding PEEKUSER and POKEUSER are shifted to arch/um/sys-<subarch>/ptrace.c.
Also s390 debug registers need to be updated, when singlestepping is switched
on / off. Thus, setting/resetting of singlestepping is centralized in the new
function set_singlestep(), which also inserts the macro
SUBARCH_SET_SINGLESTEP(mode), if defined.
Finally, s390 has the "ieee_instruction_pointer" in its
registers, which also is allowed to be read via
ptrace( PTRACE_PEEKUSER, getpid(), PT_IEEE_IP, 0);
To implement this feature, sys_ptrace inserts the macro
SUBARCH_PTRACE_SPECIAL, if defined.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-07 04:30:46 +00:00
|
|
|
set_singlestepping(child, 1);
|
2005-04-16 22:20:36 +00:00
|
|
|
child->exit_code = data;
|
|
|
|
/* give it a chance to run. */
|
|
|
|
wake_up_process(child);
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef PTRACE_GETREGS
|
|
|
|
case PTRACE_GETREGS: { /* Get all gp regs from the child. */
|
2006-03-31 10:30:15 +00:00
|
|
|
if (!access_ok(VERIFY_WRITE, p, MAX_REG_OFFSET)) {
|
2005-04-16 22:20:36 +00:00
|
|
|
ret = -EIO;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
for ( i = 0; i < MAX_REG_OFFSET; i += sizeof(long) ) {
|
2006-03-31 10:30:15 +00:00
|
|
|
__put_user(getreg(child, i), p);
|
|
|
|
p++;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef PTRACE_SETREGS
|
|
|
|
case PTRACE_SETREGS: { /* Set all gp regs in the child. */
|
|
|
|
unsigned long tmp = 0;
|
2006-03-31 10:30:15 +00:00
|
|
|
if (!access_ok(VERIFY_READ, p, MAX_REG_OFFSET)) {
|
2005-04-16 22:20:36 +00:00
|
|
|
ret = -EIO;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
for ( i = 0; i < MAX_REG_OFFSET; i += sizeof(long) ) {
|
2006-03-31 10:30:15 +00:00
|
|
|
__get_user(tmp, p);
|
2005-04-16 22:20:36 +00:00
|
|
|
putreg(child, i, tmp);
|
2006-03-31 10:30:15 +00:00
|
|
|
p++;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef PTRACE_GETFPREGS
|
|
|
|
case PTRACE_GETFPREGS: /* Get the child FPU state. */
|
|
|
|
ret = get_fpregs(data, child);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef PTRACE_SETFPREGS
|
|
|
|
case PTRACE_SETFPREGS: /* Set the child FPU state. */
|
|
|
|
ret = set_fpregs(data, child);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef PTRACE_GETFPXREGS
|
|
|
|
case PTRACE_GETFPXREGS: /* Get the child FPU state. */
|
|
|
|
ret = get_fpxregs(data, child);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef PTRACE_SETFPXREGS
|
|
|
|
case PTRACE_SETFPXREGS: /* Set the child FPU state. */
|
|
|
|
ret = set_fpxregs(data, child);
|
|
|
|
break;
|
|
|
|
#endif
|
2006-03-31 10:30:22 +00:00
|
|
|
case PTRACE_GET_THREAD_AREA:
|
|
|
|
ret = ptrace_get_thread_area(child, addr,
|
|
|
|
(struct user_desc __user *) data);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PTRACE_SET_THREAD_AREA:
|
|
|
|
ret = ptrace_set_thread_area(child, addr,
|
|
|
|
(struct user_desc __user *) data);
|
|
|
|
break;
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
case PTRACE_FAULTINFO: {
|
2006-03-31 10:30:15 +00:00
|
|
|
/* Take the info from thread->arch->faultinfo,
|
|
|
|
* but transfer max. sizeof(struct ptrace_faultinfo).
|
|
|
|
* On i386, ptrace_faultinfo is smaller!
|
|
|
|
*/
|
|
|
|
ret = copy_to_user(p, &child->thread.arch.faultinfo,
|
|
|
|
sizeof(struct ptrace_faultinfo));
|
2005-04-16 22:20:36 +00:00
|
|
|
if(ret)
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
[PATCH] uml: S390 preparation, abstract host page fault data
This patch removes the arch-specific fault/trap-infos from thread and
skas-regs.
It adds a new struct faultinfo, that is arch-specific defined in
sysdep/faultinfo.h.
The structure is inserted in thread.arch and thread.regs.skas and
thread.regs.tt
Now, segv and other trap-handlers can copy the contents from regs.X.faultinfo
to thread.arch.faultinfo with one simple assignment.
Also, the number of macros necessary is reduced to
FAULT_ADDRESS(struct faultinfo)
extracts the faulting address from faultinfo
FAULT_WRITE(struct faultinfo)
extracts the "is_write" flag
SEGV_IS_FIXABLE(struct faultinfo)
is true for the fixable segvs, i.e. (TRAP == 14)
on i386
UPT_FAULTINFO(regs)
result is (struct faultinfo *) to the faultinfo
in regs->skas.faultinfo
GET_FAULTINFO_FROM_SC(struct faultinfo, struct sigcontext *)
copies the relevant parts of the sigcontext to
struct faultinfo.
On SIGSEGV, call user_signal() instead of handle_segv(), if the architecture
provides the information needed in PTRACE_FAULTINFO, or if PTRACE_FAULTINFO is
missing, because segv-stub will provide the info.
The benefit of the change is, that in case of a non-fixable SIGSEGV, we can
give user processes a SIGSEGV, instead of possibly looping on pagefault
handling.
Since handle_segv() sikked arch_fixup() implicitly by passing ip==0 to segv(),
I changed segv() to call arch_fixup() only, if !is_user.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-05 23:15:31 +00:00
|
|
|
#ifdef PTRACE_LDT
|
2005-04-16 22:20:36 +00:00
|
|
|
case PTRACE_LDT: {
|
|
|
|
struct ptrace_ldt ldt;
|
|
|
|
|
2006-03-31 10:30:15 +00:00
|
|
|
if(copy_from_user(&ldt, p, sizeof(ldt))){
|
2005-04-16 22:20:36 +00:00
|
|
|
ret = -EIO;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This one is confusing, so just punt and return -EIO for
|
|
|
|
* now
|
|
|
|
*/
|
|
|
|
ret = -EIO;
|
|
|
|
break;
|
|
|
|
}
|
[PATCH] uml: S390 preparation, abstract host page fault data
This patch removes the arch-specific fault/trap-infos from thread and
skas-regs.
It adds a new struct faultinfo, that is arch-specific defined in
sysdep/faultinfo.h.
The structure is inserted in thread.arch and thread.regs.skas and
thread.regs.tt
Now, segv and other trap-handlers can copy the contents from regs.X.faultinfo
to thread.arch.faultinfo with one simple assignment.
Also, the number of macros necessary is reduced to
FAULT_ADDRESS(struct faultinfo)
extracts the faulting address from faultinfo
FAULT_WRITE(struct faultinfo)
extracts the "is_write" flag
SEGV_IS_FIXABLE(struct faultinfo)
is true for the fixable segvs, i.e. (TRAP == 14)
on i386
UPT_FAULTINFO(regs)
result is (struct faultinfo *) to the faultinfo
in regs->skas.faultinfo
GET_FAULTINFO_FROM_SC(struct faultinfo, struct sigcontext *)
copies the relevant parts of the sigcontext to
struct faultinfo.
On SIGSEGV, call user_signal() instead of handle_segv(), if the architecture
provides the information needed in PTRACE_FAULTINFO, or if PTRACE_FAULTINFO is
missing, because segv-stub will provide the info.
The benefit of the change is, that in case of a non-fixable SIGSEGV, we can
give user processes a SIGSEGV, instead of possibly looping on pagefault
handling.
Since handle_segv() sikked arch_fixup() implicitly by passing ip==0 to segv(),
I changed segv() to call arch_fixup() only, if !is_user.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-05 23:15:31 +00:00
|
|
|
#endif
|
2005-04-16 22:20:36 +00:00
|
|
|
#ifdef CONFIG_PROC_MM
|
|
|
|
case PTRACE_SWITCH_MM: {
|
|
|
|
struct mm_struct *old = child->mm;
|
|
|
|
struct mm_struct *new = proc_mm_get_mm(data);
|
|
|
|
|
|
|
|
if(IS_ERR(new)){
|
|
|
|
ret = PTR_ERR(new);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
atomic_inc(&new->mm_users);
|
|
|
|
child->mm = new;
|
|
|
|
child->active_mm = new;
|
|
|
|
mmput(old);
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
2007-02-10 09:44:30 +00:00
|
|
|
#endif
|
|
|
|
#ifdef PTRACE_ARCH_PRCTL
|
|
|
|
case PTRACE_ARCH_PRCTL:
|
|
|
|
/* XXX Calls ptrace on the host - needs some SMP thinking */
|
2007-10-16 08:26:58 +00:00
|
|
|
ret = arch_prctl(child, data, (void *) addr);
|
2007-02-10 09:44:30 +00:00
|
|
|
break;
|
2005-04-16 22:20:36 +00:00
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
ret = ptrace_request(child, request, addr, data);
|
|
|
|
break;
|
|
|
|
}
|
2005-11-07 08:59:47 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-10-16 08:26:58 +00:00
|
|
|
void send_sigtrap(struct task_struct *tsk, struct uml_pt_regs *regs,
|
2005-04-16 22:20:36 +00:00
|
|
|
int error_code)
|
|
|
|
{
|
|
|
|
struct siginfo info;
|
|
|
|
|
|
|
|
memset(&info, 0, sizeof(info));
|
|
|
|
info.si_signo = SIGTRAP;
|
|
|
|
info.si_code = TRAP_BRKPT;
|
|
|
|
|
|
|
|
/* User-mode eip? */
|
|
|
|
info.si_addr = UPT_IS_USER(regs) ? (void __user *) UPT_IP(regs) : NULL;
|
|
|
|
|
|
|
|
/* Send us the fakey SIGTRAP */
|
|
|
|
force_sig_info(SIGTRAP, &info, tsk);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX Check PT_DTRACE vs TIF_SINGLESTEP for singlestepping check and
|
|
|
|
* PT_PTRACED vs TIF_SYSCALL_TRACE for syscall tracing check
|
|
|
|
*/
|
2007-10-16 08:26:58 +00:00
|
|
|
void syscall_trace(struct uml_pt_regs *regs, int entryexit)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
int is_singlestep = (current->ptrace & PT_DTRACE) && entryexit;
|
|
|
|
int tracesysgood;
|
|
|
|
|
|
|
|
if (unlikely(current->audit_context)) {
|
|
|
|
if (!entryexit)
|
2006-03-30 01:23:36 +00:00
|
|
|
audit_syscall_entry(HOST_AUDIT_ARCH,
|
2005-05-03 06:54:51 +00:00
|
|
|
UPT_SYSCALL_NR(regs),
|
|
|
|
UPT_SYSCALL_ARG1(regs),
|
|
|
|
UPT_SYSCALL_ARG2(regs),
|
|
|
|
UPT_SYSCALL_ARG3(regs),
|
|
|
|
UPT_SYSCALL_ARG4(regs));
|
2006-03-30 01:23:36 +00:00
|
|
|
else audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),
|
2005-05-28 22:51:53 +00:00
|
|
|
UPT_SYSCALL_RET(regs));
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Fake a debug trap */
|
|
|
|
if (is_singlestep)
|
|
|
|
send_sigtrap(current, regs, 0);
|
|
|
|
|
|
|
|
if (!test_thread_flag(TIF_SYSCALL_TRACE))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!(current->ptrace & PT_PTRACED))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* the 0x80 provides a way for the tracing parent to distinguish
|
|
|
|
between a syscall stop and SIGTRAP delivery */
|
|
|
|
tracesysgood = (current->ptrace & PT_TRACESYSGOOD);
|
|
|
|
ptrace_notify(SIGTRAP | (tracesysgood ? 0x80 : 0));
|
|
|
|
|
|
|
|
if (entryexit) /* force do_signal() --> is_syscall() */
|
|
|
|
set_thread_flag(TIF_SIGPENDING);
|
|
|
|
|
|
|
|
/* this isn't the same as continuing with a signal, but it will do
|
|
|
|
* for normal use. strace only continues with a signal if the
|
|
|
|
* stopping signal is not SIGTRAP. -brl
|
|
|
|
*/
|
|
|
|
if (current->exit_code) {
|
|
|
|
send_sig(current->exit_code, current, 1);
|
|
|
|
current->exit_code = 0;
|
|
|
|
}
|
|
|
|
}
|