3e6f2ac480
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>
116 lines
2.9 KiB
C
116 lines
2.9 KiB
C
/*
|
|
* Copyright (C) 2003 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
* Copyright 2003 PathScale, Inc.
|
|
*
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include "linux/linkage.h"
|
|
#include "linux/personality.h"
|
|
#include "linux/utsname.h"
|
|
#include "asm/prctl.h" /* XXX This should get the constants from libc */
|
|
#include "asm/uaccess.h"
|
|
#include "os.h"
|
|
|
|
asmlinkage long sys_uname64(struct new_utsname __user * name)
|
|
{
|
|
int err;
|
|
|
|
down_read(&uts_sem);
|
|
err = copy_to_user(name, utsname(), sizeof (*name));
|
|
up_read(&uts_sem);
|
|
|
|
if (personality(current->personality) == PER_LINUX32)
|
|
err |= copy_to_user(&name->machine, "i686", 5);
|
|
|
|
return err ? -EFAULT : 0;
|
|
}
|
|
|
|
long arch_prctl(struct task_struct *task, int code, unsigned long __user *addr)
|
|
{
|
|
unsigned long *ptr = addr, tmp;
|
|
long ret;
|
|
int pid = task->mm->context.id.u.pid;
|
|
|
|
/*
|
|
* With ARCH_SET_FS (and ARCH_SET_GS is treated similarly to
|
|
* be safe), we need to call arch_prctl on the host because
|
|
* setting %fs may result in something else happening (like a
|
|
* GDT or thread.fs being set instead). So, we let the host
|
|
* fiddle the registers and thread struct and restore the
|
|
* registers afterwards.
|
|
*
|
|
* So, the saved registers are stored to the process (this
|
|
* needed because a stub may have been the last thing to run),
|
|
* arch_prctl is run on the host, then the registers are read
|
|
* back.
|
|
*/
|
|
switch (code) {
|
|
case ARCH_SET_FS:
|
|
case ARCH_SET_GS:
|
|
ret = restore_registers(pid, ¤t->thread.regs.regs);
|
|
if (ret)
|
|
return ret;
|
|
break;
|
|
case ARCH_GET_FS:
|
|
case ARCH_GET_GS:
|
|
/*
|
|
* With these two, we read to a local pointer and
|
|
* put_user it to the userspace pointer that we were
|
|
* given. If addr isn't valid (because it hasn't been
|
|
* faulted in or is just bogus), we want put_user to
|
|
* fault it in (or return -EFAULT) instead of having
|
|
* the host return -EFAULT.
|
|
*/
|
|
ptr = &tmp;
|
|
}
|
|
|
|
ret = os_arch_prctl(pid, code, ptr);
|
|
if (ret)
|
|
return ret;
|
|
|
|
switch (code) {
|
|
case ARCH_SET_FS:
|
|
current->thread.arch.fs = (unsigned long) ptr;
|
|
ret = save_registers(pid, ¤t->thread.regs.regs);
|
|
break;
|
|
case ARCH_SET_GS:
|
|
ret = save_registers(pid, ¤t->thread.regs.regs);
|
|
break;
|
|
case ARCH_GET_FS:
|
|
ret = put_user(tmp, addr);
|
|
break;
|
|
case ARCH_GET_GS:
|
|
ret = put_user(tmp, addr);
|
|
break;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
long sys_arch_prctl(int code, unsigned long addr)
|
|
{
|
|
return arch_prctl(current, code, (unsigned long __user *) addr);
|
|
}
|
|
|
|
long sys_clone(unsigned long clone_flags, unsigned long newsp,
|
|
void __user *parent_tid, void __user *child_tid)
|
|
{
|
|
long ret;
|
|
|
|
if (!newsp)
|
|
newsp = UPT_SP(¤t->thread.regs.regs);
|
|
current->thread.forking = 1;
|
|
ret = do_fork(clone_flags, newsp, ¤t->thread.regs, 0, parent_tid,
|
|
child_tid);
|
|
current->thread.forking = 0;
|
|
return ret;
|
|
}
|
|
|
|
void arch_switch_to(struct task_struct *to)
|
|
{
|
|
if ((to->thread.arch.fs == 0) || (to->mm == NULL))
|
|
return;
|
|
|
|
arch_prctl(to, ARCH_SET_FS, (void __user *) to->thread.arch.fs);
|
|
}
|