diff options
author | Jeff Dike <jdike@addtoit.com> | 2008-02-05 01:30:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:28 -0500 |
commit | 3e6f2ac480ce398ade2fd6b5e02d00d1265f1e0f (patch) | |
tree | 25f5589189170c20a765d4e6f0c56b42ad58ea20 /arch/um/os-Linux/registers.c | |
parent | d25f2e1235aab716c9fd6ba36c42503627a3a0e3 (diff) |
uml: kill processes instead of panicing kernel
UML was panicing in the case of failures of libc calls which shouldn't happen.
This is an overreaction since a failure from libc doesn't normally mean that
kernel data structures are in an unknown state. Instead, the current process
should just be killed if there is no way to recover.
The case that prompted this was a failure of PTRACE_SETREGS restoring the same
state that was read by PTRACE_GETREGS. It appears that when a process tries
to load a bogus value into a segment register, it segfaults (as expected) and
the value is actually loaded and is seen by PTRACE_GETREGS (not expected).
This case is fixed by forcing a fatal SIGSEGV on the process so that it
immediately dies. fatal_sigsegv was added for this purpose. It was declared
as noreturn, so in order to pursuade gcc that it actually does not return, I
added a call to os_dump_core (and declared it noreturn) so that I get a core
file if somehow the process survives.
All other calls in arch/um/os-Linux/skas/process.c got the same treatment,
with failures causing the process to die instead of a kernel panic, with some
exceptions.
userspace_tramp exits with status 1 if anything goes wrong there. That will
cause start_userspace to return an error. copy_context_skas0 and
map_stub_pages also now return errors instead of panicing. Callers of thes
functions were changed to check for errors and do something appropriate.
Usually that's to return an error to their callers.
check_skas3_ptrace_faultinfo just exits since that's too early to do anything
else.
save_registers, restore_registers, and init_registers now return status
instead of panicing on failure, with their callers doing something
appropriate.
There were also duplicate declarations of save_registers and restore_registers
in os.h - these are gone.
I noticed and fixed up some whitespace damage.
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>
Diffstat (limited to 'arch/um/os-Linux/registers.c')
-rw-r--r-- | arch/um/os-Linux/registers.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/um/os-Linux/registers.c b/arch/um/os-Linux/registers.c index c78fae3aba81..830fe6a1518a 100644 --- a/arch/um/os-Linux/registers.c +++ b/arch/um/os-Linux/registers.c | |||
@@ -8,42 +8,41 @@ | |||
8 | #include <string.h> | 8 | #include <string.h> |
9 | #include <sys/ptrace.h> | 9 | #include <sys/ptrace.h> |
10 | #include "sysdep/ptrace.h" | 10 | #include "sysdep/ptrace.h" |
11 | #include "user.h" | ||
12 | 11 | ||
13 | void save_registers(int pid, struct uml_pt_regs *regs) | 12 | int save_registers(int pid, struct uml_pt_regs *regs) |
14 | { | 13 | { |
15 | int err; | 14 | int err; |
16 | 15 | ||
17 | err = ptrace(PTRACE_GETREGS, pid, 0, regs->gp); | 16 | err = ptrace(PTRACE_GETREGS, pid, 0, regs->gp); |
18 | if (err < 0) | 17 | if (err < 0) |
19 | panic("save_registers - saving registers failed, errno = %d\n", | 18 | return -errno; |
20 | errno); | 19 | return 0; |
21 | } | 20 | } |
22 | 21 | ||
23 | void restore_registers(int pid, struct uml_pt_regs *regs) | 22 | int restore_registers(int pid, struct uml_pt_regs *regs) |
24 | { | 23 | { |
25 | int err; | 24 | int err; |
26 | 25 | ||
27 | err = ptrace(PTRACE_SETREGS, pid, 0, regs->gp); | 26 | err = ptrace(PTRACE_SETREGS, pid, 0, regs->gp); |
28 | if (err < 0) | 27 | if (err < 0) |
29 | panic("restore_registers - saving registers failed, " | 28 | return -errno; |
30 | "errno = %d\n", errno); | 29 | return 0; |
31 | } | 30 | } |
32 | 31 | ||
33 | /* This is set once at boot time and not changed thereafter */ | 32 | /* This is set once at boot time and not changed thereafter */ |
34 | 33 | ||
35 | static unsigned long exec_regs[MAX_REG_NR]; | 34 | static unsigned long exec_regs[MAX_REG_NR]; |
36 | 35 | ||
37 | void init_registers(int pid) | 36 | int init_registers(int pid) |
38 | { | 37 | { |
39 | int err; | 38 | int err; |
40 | 39 | ||
41 | err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs); | 40 | err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs); |
42 | if (err) | 41 | if (err < 0) |
43 | panic("check_ptrace : PTRACE_GETREGS failed, errno = %d", | 42 | return -errno; |
44 | errno); | ||
45 | 43 | ||
46 | arch_init_registers(pid); | 44 | arch_init_registers(pid); |
45 | return 0; | ||
47 | } | 46 | } |
48 | 47 | ||
49 | void get_safe_registers(unsigned long *regs) | 48 | void get_safe_registers(unsigned long *regs) |