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

uml: improve PTRACE_SYSEMU checking

Browse Source 
Make the PTRACE_SYSEMU checking more robust.  It will make sure that system
call numbers are reported correctly.  If there is a problem, it will disable
PTRACE_SYSEMU use and use PTRACE_SYSCALL instead.

Thanks to Balaji G for helping reproduce this problem.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike
2007-05-23 13:57:40 -07:00
committed by Linus Torvalds
parent da90fa8ff6
commit cf6acedbea
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/um/os-Linux/start_up.c
View File

@@ -144,9 +144,7 @@ static int stop_ptraced_child(int pid, void *stack, int exitcode,
int exit_with = WEXITSTATUS(status); int exit_with = WEXITSTATUS(status);
if (exit_with == 2) if (exit_with == 2)
non_fatal("check_ptrace : child exited with status 2. " non_fatal("check_ptrace : child exited with status 2. "
"Serious trouble happening! Try updating " "\nDisabling SYSEMU support.\n");
"your host skas patch!\nDisabling SYSEMU "
"support.");
non_fatal("check_ptrace : child exited with exitcode %d, while " non_fatal("check_ptrace : child exited with exitcode %d, while "
"expecting %d; status 0x%x\n", exit_with, "expecting %d; status 0x%x\n", exit_with,
exitcode, status); exitcode, status);
@@ -209,6 +207,7 @@ __uml_setup("nosysemu", nosysemu_cmd_param,
static void __init check_sysemu(void) static void __init check_sysemu(void)
{ {
void *stack; void *stack;
unsigned long regs[MAX_REG_NR];
int pid, n, status, count=0; int pid, n, status, count=0;
non_fatal("Checking syscall emulation patch for ptrace..."); non_fatal("Checking syscall emulation patch for ptrace...");
@@ -225,11 +224,20 @@ static void __init check_sysemu(void)
fatal("check_sysemu : expected SIGTRAP, got status = %d", fatal("check_sysemu : expected SIGTRAP, got status = %d",
status); status);
n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, if(ptrace(PTRACE_GETREGS, pid, 0, regs) < 0)
os_getpid()); fatal_perror("check_sysemu : PTRACE_GETREGS failed");
if(n < 0) if(PT_SYSCALL_NR(regs) != __NR_getpid){
fatal_perror("check_sysemu : failed to modify system call " non_fatal("check_sysemu got system call number %d, "
"return"); "expected %d...", PT_SYSCALL_NR(regs), __NR_getpid);
goto fail;
}
n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, os_getpid());
if(n < 0){
non_fatal("check_sysemu : failed to modify system call "
"return");
goto fail;
}
if (stop_ptraced_child(pid, stack, 0, 0) < 0) if (stop_ptraced_child(pid, stack, 0, 0) < 0)
goto fail_stopped; goto fail_stopped;