2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
*
|
|
|
|
* 1997-11-28 Modified for POSIX.1b signals by Richard Henderson
|
|
|
|
* 2000-06-20 Pentium III FXSR, SSE support by Gareth Hughes
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/smp.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/signal.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/wait.h>
|
|
|
|
#include <linux/unistd.h>
|
|
|
|
#include <linux/stddef.h>
|
|
|
|
#include <linux/personality.h>
|
|
|
|
#include <linux/suspend.h>
|
|
|
|
#include <linux/ptrace.h>
|
|
|
|
#include <linux/elf.h>
|
2007-02-13 12:26:26 +00:00
|
|
|
#include <linux/binfmts.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <asm/processor.h>
|
|
|
|
#include <asm/ucontext.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <asm/i387.h>
|
2007-10-11 09:12:46 +00:00
|
|
|
#include "sigframe_32.h"
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
#define DEBUG_SIG 0
|
|
|
|
|
|
|
|
#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Atomically swap in the new signal mask, and wait for a signal.
|
|
|
|
*/
|
|
|
|
asmlinkage int
|
|
|
|
sys_sigsuspend(int history0, int history1, old_sigset_t mask)
|
|
|
|
{
|
|
|
|
mask &= _BLOCKABLE;
|
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
2006-01-19 01:44:00 +00:00
|
|
|
current->saved_sigmask = current->blocked;
|
2005-04-16 22:20:36 +00:00
|
|
|
siginitset(¤t->blocked, mask);
|
|
|
|
recalc_sigpending();
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
|
2006-01-19 01:44:00 +00:00
|
|
|
current->state = TASK_INTERRUPTIBLE;
|
|
|
|
schedule();
|
|
|
|
set_thread_flag(TIF_RESTORE_SIGMASK);
|
|
|
|
return -ERESTARTNOHAND;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
asmlinkage int
|
|
|
|
sys_sigaction(int sig, const struct old_sigaction __user *act,
|
|
|
|
struct old_sigaction __user *oact)
|
|
|
|
{
|
|
|
|
struct k_sigaction new_ka, old_ka;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (act) {
|
|
|
|
old_sigset_t mask;
|
|
|
|
if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
|
|
|
|
__get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
|
|
|
|
__get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
|
|
|
|
return -EFAULT;
|
|
|
|
__get_user(new_ka.sa.sa_flags, &act->sa_flags);
|
|
|
|
__get_user(mask, &act->sa_mask);
|
|
|
|
siginitset(&new_ka.sa.sa_mask, mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
|
|
|
|
|
|
|
|
if (!ret && oact) {
|
|
|
|
if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
|
|
|
|
__put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
|
|
|
|
__put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
|
|
|
|
return -EFAULT;
|
|
|
|
__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
|
|
|
|
__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
asmlinkage int
|
|
|
|
sys_sigaltstack(unsigned long ebx)
|
|
|
|
{
|
|
|
|
/* This is needed to make gcc realize it doesn't own the "struct pt_regs" */
|
|
|
|
struct pt_regs *regs = (struct pt_regs *)&ebx;
|
|
|
|
const stack_t __user *uss = (const stack_t __user *)ebx;
|
|
|
|
stack_t __user *uoss = (stack_t __user *)regs->ecx;
|
|
|
|
|
|
|
|
return do_sigaltstack(uss, uoss, regs->esp);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Do a signal return; undo the signal stack.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
|
|
|
restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *peax)
|
|
|
|
{
|
|
|
|
unsigned int err = 0;
|
|
|
|
|
|
|
|
/* Always make any pending restarted system calls return -EINTR */
|
|
|
|
current_thread_info()->restart_block.fn = do_no_restart_syscall;
|
|
|
|
|
|
|
|
#define COPY(x) err |= __get_user(regs->x, &sc->x)
|
|
|
|
|
|
|
|
#define COPY_SEG(seg) \
|
|
|
|
{ unsigned short tmp; \
|
|
|
|
err |= __get_user(tmp, &sc->seg); \
|
|
|
|
regs->x##seg = tmp; }
|
|
|
|
|
|
|
|
#define COPY_SEG_STRICT(seg) \
|
|
|
|
{ unsigned short tmp; \
|
|
|
|
err |= __get_user(tmp, &sc->seg); \
|
|
|
|
regs->x##seg = tmp|3; }
|
|
|
|
|
|
|
|
#define GET_SEG(seg) \
|
|
|
|
{ unsigned short tmp; \
|
|
|
|
err |= __get_user(tmp, &sc->seg); \
|
|
|
|
loadsegment(seg,tmp); }
|
|
|
|
|
2006-03-23 10:59:40 +00:00
|
|
|
#define FIX_EFLAGS (X86_EFLAGS_AC | X86_EFLAGS_RF | \
|
|
|
|
X86_EFLAGS_OF | X86_EFLAGS_DF | \
|
2005-04-16 22:20:36 +00:00
|
|
|
X86_EFLAGS_TF | X86_EFLAGS_SF | X86_EFLAGS_ZF | \
|
|
|
|
X86_EFLAGS_AF | X86_EFLAGS_PF | X86_EFLAGS_CF)
|
|
|
|
|
2007-02-13 12:26:20 +00:00
|
|
|
GET_SEG(gs);
|
|
|
|
COPY_SEG(fs);
|
2005-04-16 22:20:36 +00:00
|
|
|
COPY_SEG(es);
|
|
|
|
COPY_SEG(ds);
|
|
|
|
COPY(edi);
|
|
|
|
COPY(esi);
|
|
|
|
COPY(ebp);
|
|
|
|
COPY(esp);
|
|
|
|
COPY(ebx);
|
|
|
|
COPY(edx);
|
|
|
|
COPY(ecx);
|
|
|
|
COPY(eip);
|
|
|
|
COPY_SEG_STRICT(cs);
|
|
|
|
COPY_SEG_STRICT(ss);
|
|
|
|
|
|
|
|
{
|
|
|
|
unsigned int tmpflags;
|
|
|
|
err |= __get_user(tmpflags, &sc->eflags);
|
|
|
|
regs->eflags = (regs->eflags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);
|
|
|
|
regs->orig_eax = -1; /* disable syscall checks */
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
struct _fpstate __user * buf;
|
|
|
|
err |= __get_user(buf, &sc->fpstate);
|
|
|
|
if (buf) {
|
|
|
|
if (!access_ok(VERIFY_READ, buf, sizeof(*buf)))
|
|
|
|
goto badframe;
|
|
|
|
err |= restore_i387(buf);
|
|
|
|
} else {
|
|
|
|
struct task_struct *me = current;
|
|
|
|
if (used_math()) {
|
|
|
|
clear_fpu(me);
|
|
|
|
clear_used_math();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
err |= __get_user(*peax, &sc->eax);
|
|
|
|
return err;
|
|
|
|
|
|
|
|
badframe:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
asmlinkage int sys_sigreturn(unsigned long __unused)
|
|
|
|
{
|
|
|
|
struct pt_regs *regs = (struct pt_regs *) &__unused;
|
|
|
|
struct sigframe __user *frame = (struct sigframe __user *)(regs->esp - 8);
|
|
|
|
sigset_t set;
|
|
|
|
int eax;
|
|
|
|
|
|
|
|
if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
|
|
|
|
goto badframe;
|
|
|
|
if (__get_user(set.sig[0], &frame->sc.oldmask)
|
|
|
|
|| (_NSIG_WORDS > 1
|
|
|
|
&& __copy_from_user(&set.sig[1], &frame->extramask,
|
|
|
|
sizeof(frame->extramask))))
|
|
|
|
goto badframe;
|
|
|
|
|
|
|
|
sigdelsetmask(&set, ~_BLOCKABLE);
|
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
|
|
|
current->blocked = set;
|
|
|
|
recalc_sigpending();
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
|
|
|
|
if (restore_sigcontext(regs, &frame->sc, &eax))
|
|
|
|
goto badframe;
|
|
|
|
return eax;
|
|
|
|
|
|
|
|
badframe:
|
2007-07-22 09:12:28 +00:00
|
|
|
if (show_unhandled_signals && printk_ratelimit())
|
|
|
|
printk("%s%s[%d] bad frame in sigreturn frame:%p eip:%lx"
|
|
|
|
" esp:%lx oeax:%lx\n",
|
|
|
|
current->pid > 1 ? KERN_INFO : KERN_EMERG,
|
|
|
|
current->comm, current->pid, frame, regs->eip,
|
|
|
|
regs->esp, regs->orig_eax);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
force_sig(SIGSEGV, current);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
asmlinkage int sys_rt_sigreturn(unsigned long __unused)
|
|
|
|
{
|
|
|
|
struct pt_regs *regs = (struct pt_regs *) &__unused;
|
|
|
|
struct rt_sigframe __user *frame = (struct rt_sigframe __user *)(regs->esp - 4);
|
|
|
|
sigset_t set;
|
|
|
|
int eax;
|
|
|
|
|
|
|
|
if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
|
|
|
|
goto badframe;
|
|
|
|
if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
|
|
|
|
goto badframe;
|
|
|
|
|
|
|
|
sigdelsetmask(&set, ~_BLOCKABLE);
|
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
|
|
|
current->blocked = set;
|
|
|
|
recalc_sigpending();
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
|
|
|
|
if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &eax))
|
|
|
|
goto badframe;
|
|
|
|
|
|
|
|
if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->esp) == -EFAULT)
|
|
|
|
goto badframe;
|
|
|
|
|
|
|
|
return eax;
|
|
|
|
|
|
|
|
badframe:
|
|
|
|
force_sig(SIGSEGV, current);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set up a signal frame.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
|
|
|
setup_sigcontext(struct sigcontext __user *sc, struct _fpstate __user *fpstate,
|
|
|
|
struct pt_regs *regs, unsigned long mask)
|
|
|
|
{
|
|
|
|
int tmp, err = 0;
|
|
|
|
|
2007-02-13 12:26:20 +00:00
|
|
|
err |= __put_user(regs->xfs, (unsigned int __user *)&sc->fs);
|
|
|
|
savesegment(gs, tmp);
|
|
|
|
err |= __put_user(tmp, (unsigned int __user *)&sc->gs);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
err |= __put_user(regs->xes, (unsigned int __user *)&sc->es);
|
|
|
|
err |= __put_user(regs->xds, (unsigned int __user *)&sc->ds);
|
|
|
|
err |= __put_user(regs->edi, &sc->edi);
|
|
|
|
err |= __put_user(regs->esi, &sc->esi);
|
|
|
|
err |= __put_user(regs->ebp, &sc->ebp);
|
|
|
|
err |= __put_user(regs->esp, &sc->esp);
|
|
|
|
err |= __put_user(regs->ebx, &sc->ebx);
|
|
|
|
err |= __put_user(regs->edx, &sc->edx);
|
|
|
|
err |= __put_user(regs->ecx, &sc->ecx);
|
|
|
|
err |= __put_user(regs->eax, &sc->eax);
|
|
|
|
err |= __put_user(current->thread.trap_no, &sc->trapno);
|
|
|
|
err |= __put_user(current->thread.error_code, &sc->err);
|
|
|
|
err |= __put_user(regs->eip, &sc->eip);
|
|
|
|
err |= __put_user(regs->xcs, (unsigned int __user *)&sc->cs);
|
|
|
|
err |= __put_user(regs->eflags, &sc->eflags);
|
|
|
|
err |= __put_user(regs->esp, &sc->esp_at_signal);
|
|
|
|
err |= __put_user(regs->xss, (unsigned int __user *)&sc->ss);
|
|
|
|
|
|
|
|
tmp = save_i387(fpstate);
|
|
|
|
if (tmp < 0)
|
|
|
|
err = 1;
|
|
|
|
else
|
|
|
|
err |= __put_user(tmp ? fpstate : NULL, &sc->fpstate);
|
|
|
|
|
|
|
|
/* non-iBCS2 extensions.. */
|
|
|
|
err |= __put_user(mask, &sc->oldmask);
|
|
|
|
err |= __put_user(current->thread.cr2, &sc->cr2);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Determine which stack to use..
|
|
|
|
*/
|
|
|
|
static inline void __user *
|
|
|
|
get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
|
|
|
|
{
|
|
|
|
unsigned long esp;
|
|
|
|
|
|
|
|
/* Default to using normal stack */
|
|
|
|
esp = regs->esp;
|
|
|
|
|
|
|
|
/* This is the X/Open sanctioned signal stack switching. */
|
|
|
|
if (ka->sa.sa_flags & SA_ONSTACK) {
|
|
|
|
if (sas_ss_flags(esp) == 0)
|
|
|
|
esp = current->sas_ss_sp + current->sas_ss_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is the legacy signal stack switching. */
|
|
|
|
else if ((regs->xss & 0xffff) != __USER_DS &&
|
|
|
|
!(ka->sa.sa_flags & SA_RESTORER) &&
|
|
|
|
ka->sa.sa_restorer) {
|
|
|
|
esp = (unsigned long) ka->sa.sa_restorer;
|
|
|
|
}
|
|
|
|
|
2005-10-09 16:54:23 +00:00
|
|
|
esp -= frame_size;
|
|
|
|
/* Align the stack pointer according to the i386 ABI,
|
|
|
|
* i.e. so that on function entry ((sp + 4) & 15) == 0. */
|
|
|
|
esp = ((esp + 4) & -16ul) - 4;
|
|
|
|
return (void __user *) esp;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* These symbols are defined with the addresses in the vsyscall page.
|
|
|
|
See vsyscall-sigreturn.S. */
|
|
|
|
extern void __user __kernel_sigreturn;
|
|
|
|
extern void __user __kernel_rt_sigreturn;
|
|
|
|
|
2005-06-23 07:08:21 +00:00
|
|
|
static int setup_frame(int sig, struct k_sigaction *ka,
|
|
|
|
sigset_t *set, struct pt_regs * regs)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
void __user *restorer;
|
|
|
|
struct sigframe __user *frame;
|
|
|
|
int err = 0;
|
|
|
|
int usig;
|
|
|
|
|
|
|
|
frame = get_sigframe(ka, regs, sizeof(*frame));
|
|
|
|
|
|
|
|
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
usig = current_thread_info()->exec_domain
|
|
|
|
&& current_thread_info()->exec_domain->signal_invmap
|
|
|
|
&& sig < 32
|
|
|
|
? current_thread_info()->exec_domain->signal_invmap[sig]
|
|
|
|
: sig;
|
|
|
|
|
|
|
|
err = __put_user(usig, &frame->sig);
|
|
|
|
if (err)
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
err = setup_sigcontext(&frame->sc, &frame->fpstate, regs, set->sig[0]);
|
|
|
|
if (err)
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
if (_NSIG_WORDS > 1) {
|
|
|
|
err = __copy_to_user(&frame->extramask, &set->sig[1],
|
|
|
|
sizeof(frame->extramask));
|
|
|
|
if (err)
|
|
|
|
goto give_sigsegv;
|
|
|
|
}
|
|
|
|
|
2007-02-13 12:26:26 +00:00
|
|
|
if (current->binfmt->hasvdso)
|
|
|
|
restorer = (void *)VDSO_SYM(&__kernel_sigreturn);
|
|
|
|
else
|
|
|
|
restorer = (void *)&frame->retcode;
|
2005-04-16 22:20:36 +00:00
|
|
|
if (ka->sa.sa_flags & SA_RESTORER)
|
|
|
|
restorer = ka->sa.sa_restorer;
|
|
|
|
|
|
|
|
/* Set up to return from userspace. */
|
|
|
|
err |= __put_user(restorer, &frame->pretcode);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is popl %eax ; movl $,%eax ; int $0x80
|
|
|
|
*
|
|
|
|
* WE DO NOT USE IT ANY MORE! It's only left here for historical
|
|
|
|
* reasons and because gdb uses it as a signature to notice
|
|
|
|
* signal handler stack frames.
|
|
|
|
*/
|
|
|
|
err |= __put_user(0xb858, (short __user *)(frame->retcode+0));
|
|
|
|
err |= __put_user(__NR_sigreturn, (int __user *)(frame->retcode+2));
|
|
|
|
err |= __put_user(0x80cd, (short __user *)(frame->retcode+6));
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
/* Set up registers for signal handler */
|
|
|
|
regs->esp = (unsigned long) frame;
|
|
|
|
regs->eip = (unsigned long) ka->sa.sa_handler;
|
|
|
|
regs->eax = (unsigned long) sig;
|
|
|
|
regs->edx = (unsigned long) 0;
|
|
|
|
regs->ecx = (unsigned long) 0;
|
|
|
|
|
|
|
|
set_fs(USER_DS);
|
|
|
|
regs->xds = __USER_DS;
|
|
|
|
regs->xes = __USER_DS;
|
|
|
|
regs->xss = __USER_DS;
|
|
|
|
regs->xcs = __USER_CS;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Clear TF when entering the signal handler, but
|
|
|
|
* notify any tracer that was single-stepping it.
|
|
|
|
* The tracer may want to single-step inside the
|
|
|
|
* handler too.
|
|
|
|
*/
|
|
|
|
regs->eflags &= ~TF_MASK;
|
|
|
|
if (test_thread_flag(TIF_SINGLESTEP))
|
|
|
|
ptrace_notify(SIGTRAP);
|
|
|
|
|
|
|
|
#if DEBUG_SIG
|
|
|
|
printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",
|
|
|
|
current->comm, current->pid, frame, regs->eip, frame->pretcode);
|
|
|
|
#endif
|
|
|
|
|
2006-01-19 01:44:00 +00:00
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
give_sigsegv:
|
|
|
|
force_sigsegv(sig, current);
|
2006-01-19 01:44:00 +00:00
|
|
|
return -EFAULT;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-06-23 07:08:21 +00:00
|
|
|
static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
|
2005-04-16 22:20:36 +00:00
|
|
|
sigset_t *set, struct pt_regs * regs)
|
|
|
|
{
|
|
|
|
void __user *restorer;
|
|
|
|
struct rt_sigframe __user *frame;
|
|
|
|
int err = 0;
|
|
|
|
int usig;
|
|
|
|
|
|
|
|
frame = get_sigframe(ka, regs, sizeof(*frame));
|
|
|
|
|
|
|
|
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
usig = current_thread_info()->exec_domain
|
|
|
|
&& current_thread_info()->exec_domain->signal_invmap
|
|
|
|
&& sig < 32
|
|
|
|
? current_thread_info()->exec_domain->signal_invmap[sig]
|
|
|
|
: sig;
|
|
|
|
|
|
|
|
err |= __put_user(usig, &frame->sig);
|
|
|
|
err |= __put_user(&frame->info, &frame->pinfo);
|
|
|
|
err |= __put_user(&frame->uc, &frame->puc);
|
|
|
|
err |= copy_siginfo_to_user(&frame->info, info);
|
|
|
|
if (err)
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
/* Create the ucontext. */
|
|
|
|
err |= __put_user(0, &frame->uc.uc_flags);
|
|
|
|
err |= __put_user(0, &frame->uc.uc_link);
|
|
|
|
err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
|
|
|
|
err |= __put_user(sas_ss_flags(regs->esp),
|
|
|
|
&frame->uc.uc_stack.ss_flags);
|
|
|
|
err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
|
|
|
|
err |= setup_sigcontext(&frame->uc.uc_mcontext, &frame->fpstate,
|
|
|
|
regs, set->sig[0]);
|
|
|
|
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
|
|
|
|
if (err)
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
/* Set up to return from userspace. */
|
[PATCH] vdso: randomize the i386 vDSO by moving it into a vma
Move the i386 VDSO down into a vma and thus randomize it.
Besides the security implications, this feature also helps debuggers, which
can COW a vma-backed VDSO just like a normal DSO and can thus do
single-stepping and other debugging features.
It's good for hypervisors (Xen, VMWare) too, which typically live in the same
high-mapped address space as the VDSO, hence whenever the VDSO is used, they
get lots of guest pagefaults and have to fix such guest accesses up - which
slows things down instead of speeding things up (the primary purpose of the
VDSO).
There's a new CONFIG_COMPAT_VDSO (default=y) option, which provides support
for older glibcs that still rely on a prelinked high-mapped VDSO. Newer
distributions (using glibc 2.3.3 or later) can turn this option off. Turning
it off is also recommended for security reasons: attackers cannot use the
predictable high-mapped VDSO page as syscall trampoline anymore.
There is a new vdso=[0|1] boot option as well, and a runtime
/proc/sys/vm/vdso_enabled sysctl switch, that allows the VDSO to be turned
on/off.
(This version of the VDSO-randomization patch also has working ELF
coredumping, the previous patch crashed in the coredumping code.)
This code is a combined work of the exec-shield VDSO randomization
code and Gerd Hoffmann's hypervisor-centric VDSO patch. Rusty Russell
started this patch and i completed it.
[akpm@osdl.org: cleanups]
[akpm@osdl.org: compile fix]
[akpm@osdl.org: compile fix 2]
[akpm@osdl.org: compile fix 3]
[akpm@osdl.org: revernt MAXMEM change]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Cc: Gerd Hoffmann <kraxel@suse.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Zachary Amsden <zach@vmware.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-27 09:53:50 +00:00
|
|
|
restorer = (void *)VDSO_SYM(&__kernel_rt_sigreturn);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (ka->sa.sa_flags & SA_RESTORER)
|
|
|
|
restorer = ka->sa.sa_restorer;
|
|
|
|
err |= __put_user(restorer, &frame->pretcode);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is movl $,%eax ; int $0x80
|
|
|
|
*
|
|
|
|
* WE DO NOT USE IT ANY MORE! It's only left here for historical
|
|
|
|
* reasons and because gdb uses it as a signature to notice
|
|
|
|
* signal handler stack frames.
|
|
|
|
*/
|
|
|
|
err |= __put_user(0xb8, (char __user *)(frame->retcode+0));
|
|
|
|
err |= __put_user(__NR_rt_sigreturn, (int __user *)(frame->retcode+1));
|
|
|
|
err |= __put_user(0x80cd, (short __user *)(frame->retcode+5));
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
goto give_sigsegv;
|
|
|
|
|
|
|
|
/* Set up registers for signal handler */
|
|
|
|
regs->esp = (unsigned long) frame;
|
|
|
|
regs->eip = (unsigned long) ka->sa.sa_handler;
|
|
|
|
regs->eax = (unsigned long) usig;
|
|
|
|
regs->edx = (unsigned long) &frame->info;
|
|
|
|
regs->ecx = (unsigned long) &frame->uc;
|
|
|
|
|
|
|
|
set_fs(USER_DS);
|
|
|
|
regs->xds = __USER_DS;
|
|
|
|
regs->xes = __USER_DS;
|
|
|
|
regs->xss = __USER_DS;
|
|
|
|
regs->xcs = __USER_CS;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Clear TF when entering the signal handler, but
|
|
|
|
* notify any tracer that was single-stepping it.
|
|
|
|
* The tracer may want to single-step inside the
|
|
|
|
* handler too.
|
|
|
|
*/
|
|
|
|
regs->eflags &= ~TF_MASK;
|
|
|
|
if (test_thread_flag(TIF_SINGLESTEP))
|
|
|
|
ptrace_notify(SIGTRAP);
|
|
|
|
|
|
|
|
#if DEBUG_SIG
|
|
|
|
printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",
|
|
|
|
current->comm, current->pid, frame, regs->eip, frame->pretcode);
|
|
|
|
#endif
|
|
|
|
|
2006-01-19 01:44:00 +00:00
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
give_sigsegv:
|
|
|
|
force_sigsegv(sig, current);
|
2006-01-19 01:44:00 +00:00
|
|
|
return -EFAULT;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* OK, we're invoking a handler
|
|
|
|
*/
|
|
|
|
|
2005-06-23 07:08:21 +00:00
|
|
|
static int
|
2005-04-16 22:20:36 +00:00
|
|
|
handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
|
|
|
|
sigset_t *oldset, struct pt_regs * regs)
|
|
|
|
{
|
2005-06-23 07:08:21 +00:00
|
|
|
int ret;
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Are we from a system call? */
|
|
|
|
if (regs->orig_eax >= 0) {
|
|
|
|
/* If so, check system call restarting.. */
|
|
|
|
switch (regs->eax) {
|
|
|
|
case -ERESTART_RESTARTBLOCK:
|
|
|
|
case -ERESTARTNOHAND:
|
|
|
|
regs->eax = -EINTR;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case -ERESTARTSYS:
|
|
|
|
if (!(ka->sa.sa_flags & SA_RESTART)) {
|
|
|
|
regs->eax = -EINTR;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* fallthrough */
|
|
|
|
case -ERESTARTNOINTR:
|
|
|
|
regs->eax = regs->orig_eax;
|
|
|
|
regs->eip -= 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If TF is set due to a debugger (PT_DTRACE), clear the TF flag so
|
|
|
|
* that register information in the sigcontext is correct.
|
|
|
|
*/
|
|
|
|
if (unlikely(regs->eflags & TF_MASK)
|
|
|
|
&& likely(current->ptrace & PT_DTRACE)) {
|
|
|
|
current->ptrace &= ~PT_DTRACE;
|
|
|
|
regs->eflags &= ~TF_MASK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set up the stack frame */
|
|
|
|
if (ka->sa.sa_flags & SA_SIGINFO)
|
2005-06-23 07:08:21 +00:00
|
|
|
ret = setup_rt_frame(sig, ka, info, oldset, regs);
|
2005-04-16 22:20:36 +00:00
|
|
|
else
|
2005-06-23 07:08:21 +00:00
|
|
|
ret = setup_frame(sig, ka, oldset, regs);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-01-19 01:44:00 +00:00
|
|
|
if (ret == 0) {
|
2005-04-16 22:20:36 +00:00
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
|
|
|
sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask);
|
[PATCH] convert signal handling of NODEFER to act like other Unix boxes.
It has been reported that the way Linux handles NODEFER for signals is
not consistent with the way other Unix boxes handle it. I've written a
program to test the behavior of how this flag affects signals and had
several reports from people who ran this on various Unix boxes,
confirming that Linux seems to be unique on the way this is handled.
The way NODEFER affects signals on other Unix boxes is as follows:
1) If NODEFER is set, other signals in sa_mask are still blocked.
2) If NODEFER is set and the signal is in sa_mask, then the signal is
still blocked. (Note: this is the behavior of all tested but Linux _and_
NetBSD 2.0 *).
The way NODEFER affects signals on Linux:
1) If NODEFER is set, other signals are _not_ blocked regardless of
sa_mask (Even NetBSD doesn't do this).
2) If NODEFER is set and the signal is in sa_mask, then the signal being
handled is not blocked.
The patch converts signal handling in all current Linux architectures to
the way most Unix boxes work.
Unix boxes that were tested: DU4, AIX 5.2, Irix 6.5, NetBSD 2.0, SFU
3.5 on WinXP, AIX 5.3, Mac OSX, and of course Linux 2.6.13-rcX.
* NetBSD was the only other Unix to behave like Linux on point #2. The
main concern was brought up by point #1 which even NetBSD isn't like
Linux. So with this patch, we leave NetBSD as the lonely one that
behaves differently here with #2.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-29 15:44:09 +00:00
|
|
|
if (!(ka->sa.sa_flags & SA_NODEFER))
|
|
|
|
sigaddset(¤t->blocked,sig);
|
2005-04-16 22:20:36 +00:00
|
|
|
recalc_sigpending();
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
}
|
2005-06-23 07:08:21 +00:00
|
|
|
|
|
|
|
return ret;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Note that 'init' is a special process: it doesn't get signals it doesn't
|
|
|
|
* want to handle. Thus you cannot kill init even with a SIGKILL even by
|
|
|
|
* mistake.
|
|
|
|
*/
|
2006-01-19 01:44:00 +00:00
|
|
|
static void fastcall do_signal(struct pt_regs *regs)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
siginfo_t info;
|
|
|
|
int signr;
|
|
|
|
struct k_sigaction ka;
|
2006-01-19 01:44:00 +00:00
|
|
|
sigset_t *oldset;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We want the common case to go fast, which
|
|
|
|
* is why we may in certain cases get here from
|
|
|
|
* kernel mode. Just return without doing anything
|
2005-09-03 22:56:43 +00:00
|
|
|
* if so. vm86 regs switched out by assembly code
|
|
|
|
* before reaching here, so testing against kernel
|
|
|
|
* CS suffices.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2005-06-23 07:08:45 +00:00
|
|
|
if (!user_mode(regs))
|
2006-01-19 01:44:00 +00:00
|
|
|
return;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-01-19 01:44:00 +00:00
|
|
|
if (test_thread_flag(TIF_RESTORE_SIGMASK))
|
|
|
|
oldset = ¤t->saved_sigmask;
|
|
|
|
else
|
2005-04-16 22:20:36 +00:00
|
|
|
oldset = ¤t->blocked;
|
|
|
|
|
|
|
|
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
|
|
|
|
if (signr > 0) {
|
|
|
|
/* Reenable any watchpoints before delivering the
|
|
|
|
* signal to user space. The processor register will
|
|
|
|
* have been cleared if the watchpoint triggered
|
|
|
|
* inside the kernel.
|
|
|
|
*/
|
2006-01-19 01:44:00 +00:00
|
|
|
if (unlikely(current->thread.debugreg[7]))
|
2005-06-23 07:08:43 +00:00
|
|
|
set_debugreg(current->thread.debugreg[7], 7);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Whee! Actually deliver the signal. */
|
2006-01-19 01:44:00 +00:00
|
|
|
if (handle_signal(signr, &info, &ka, oldset, regs) == 0) {
|
|
|
|
/* a signal was successfully delivered; the saved
|
|
|
|
* sigmask will have been stored in the signal frame,
|
|
|
|
* and will be restored by sigreturn, so we can simply
|
|
|
|
* clear the TIF_RESTORE_SIGMASK flag */
|
|
|
|
if (test_thread_flag(TIF_RESTORE_SIGMASK))
|
|
|
|
clear_thread_flag(TIF_RESTORE_SIGMASK);
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Did we come from a system call? */
|
|
|
|
if (regs->orig_eax >= 0) {
|
|
|
|
/* Restart the system call - no handlers present */
|
2006-01-19 01:44:00 +00:00
|
|
|
switch (regs->eax) {
|
|
|
|
case -ERESTARTNOHAND:
|
|
|
|
case -ERESTARTSYS:
|
|
|
|
case -ERESTARTNOINTR:
|
2005-04-16 22:20:36 +00:00
|
|
|
regs->eax = regs->orig_eax;
|
|
|
|
regs->eip -= 2;
|
2006-01-19 01:44:00 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case -ERESTART_RESTARTBLOCK:
|
2005-04-16 22:20:36 +00:00
|
|
|
regs->eax = __NR_restart_syscall;
|
|
|
|
regs->eip -= 2;
|
2006-01-19 01:44:00 +00:00
|
|
|
break;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
}
|
2006-01-19 01:44:00 +00:00
|
|
|
|
|
|
|
/* if there's no signal to deliver, we just put the saved sigmask
|
|
|
|
* back */
|
|
|
|
if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
|
|
|
|
clear_thread_flag(TIF_RESTORE_SIGMASK);
|
|
|
|
sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL);
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* notification of userspace execution resumption
|
2006-01-19 01:44:00 +00:00
|
|
|
* - triggered by the TIF_WORK_MASK flags
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
|
|
|
__attribute__((regparm(3)))
|
2006-01-19 01:44:00 +00:00
|
|
|
void do_notify_resume(struct pt_regs *regs, void *_unused,
|
2005-04-16 22:20:36 +00:00
|
|
|
__u32 thread_info_flags)
|
|
|
|
{
|
|
|
|
/* Pending single-step? */
|
|
|
|
if (thread_info_flags & _TIF_SINGLESTEP) {
|
|
|
|
regs->eflags |= TF_MASK;
|
|
|
|
clear_thread_flag(TIF_SINGLESTEP);
|
|
|
|
}
|
2006-01-19 01:44:00 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* deal with pending signal delivery */
|
2006-01-19 01:44:00 +00:00
|
|
|
if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
|
|
|
|
do_signal(regs);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
clear_thread_flag(TIF_IRET);
|
|
|
|
}
|