2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
* linux/arch/x86_64/ia32/ia32_signal.c
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* 2000-12-* x86-64 compatibility mode signal handling by Andi Kleen
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/smp.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/wait.h>
|
|
|
|
#include <linux/unistd.h>
|
|
|
|
#include <linux/stddef.h>
|
|
|
|
#include <linux/personality.h>
|
|
|
|
#include <linux/compat.h>
|
2007-02-13 13:26:26 +01:00
|
|
|
#include <linux/binfmts.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <asm/ucontext.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <asm/i387.h>
|
2012-02-21 22:19:22 +01:00
|
|
|
#include <asm/fpu-internal.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <asm/ptrace.h>
|
|
|
|
#include <asm/ia32_unistd.h>
|
|
|
|
#include <asm/user32.h>
|
|
|
|
#include <asm/sigcontext32.h>
|
|
|
|
#include <asm/proto.h>
|
2008-01-30 13:30:43 +01:00
|
|
|
#include <asm/vdso.h>
|
2008-12-18 03:52:45 +01:00
|
|
|
#include <asm/sigframe.h>
|
2012-02-19 16:38:43 +01:00
|
|
|
#include <asm/sighandling.h>
|
2008-12-27 17:07:10 +01:00
|
|
|
#include <asm/sys_ia32.h>
|
2012-09-22 02:18:44 +02:00
|
|
|
#include <asm/smap.h>
|
2008-12-18 03:52:45 +01:00
|
|
|
|
2013-10-13 23:23:53 +02:00
|
|
|
int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2009-01-24 00:50:38 +01:00
|
|
|
int err = 0;
|
2012-06-15 03:07:15 +02:00
|
|
|
bool ia32 = test_thread_flag(TIF_IA32);
|
2008-01-30 13:30:07 +01:00
|
|
|
|
|
|
|
if (!access_ok(VERIFY_WRITE, to, sizeof(compat_siginfo_t)))
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EFAULT;
|
|
|
|
|
2009-01-24 00:50:38 +01:00
|
|
|
put_user_try {
|
|
|
|
/* If you change siginfo_t structure, please make sure that
|
|
|
|
this code is fixed accordingly.
|
|
|
|
It should never copy any pad contained in the structure
|
|
|
|
to avoid security leaks, but must copy the generic
|
|
|
|
3 ints plus the relevant union member. */
|
|
|
|
put_user_ex(from->si_signo, &to->si_signo);
|
|
|
|
put_user_ex(from->si_errno, &to->si_errno);
|
|
|
|
put_user_ex((short)from->si_code, &to->si_code);
|
|
|
|
|
|
|
|
if (from->si_code < 0) {
|
|
|
|
put_user_ex(from->si_pid, &to->si_pid);
|
|
|
|
put_user_ex(from->si_uid, &to->si_uid);
|
|
|
|
put_user_ex(ptr_to_compat(from->si_ptr), &to->si_ptr);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* First 32bits of unions are always present:
|
|
|
|
* si_pid === si_band === si_tid === si_addr(LS half)
|
|
|
|
*/
|
|
|
|
put_user_ex(from->_sifields._pad[0],
|
|
|
|
&to->_sifields._pad[0]);
|
|
|
|
switch (from->si_code >> 16) {
|
|
|
|
case __SI_FAULT >> 16:
|
|
|
|
break;
|
2012-04-12 23:48:00 +02:00
|
|
|
case __SI_SYS >> 16:
|
|
|
|
put_user_ex(from->si_syscall, &to->si_syscall);
|
|
|
|
put_user_ex(from->si_arch, &to->si_arch);
|
|
|
|
break;
|
2009-01-24 00:50:38 +01:00
|
|
|
case __SI_CHLD >> 16:
|
2012-03-05 22:40:24 +01:00
|
|
|
if (ia32) {
|
|
|
|
put_user_ex(from->si_utime, &to->si_utime);
|
|
|
|
put_user_ex(from->si_stime, &to->si_stime);
|
|
|
|
} else {
|
|
|
|
put_user_ex(from->si_utime, &to->_sifields._sigchld_x32._utime);
|
|
|
|
put_user_ex(from->si_stime, &to->_sifields._sigchld_x32._stime);
|
|
|
|
}
|
2009-01-24 00:50:38 +01:00
|
|
|
put_user_ex(from->si_status, &to->si_status);
|
|
|
|
/* FALL THROUGH */
|
|
|
|
default:
|
|
|
|
case __SI_KILL >> 16:
|
|
|
|
put_user_ex(from->si_uid, &to->si_uid);
|
|
|
|
break;
|
|
|
|
case __SI_POLL >> 16:
|
|
|
|
put_user_ex(from->si_fd, &to->si_fd);
|
|
|
|
break;
|
|
|
|
case __SI_TIMER >> 16:
|
|
|
|
put_user_ex(from->si_overrun, &to->si_overrun);
|
|
|
|
put_user_ex(ptr_to_compat(from->si_ptr),
|
|
|
|
&to->si_ptr);
|
|
|
|
break;
|
|
|
|
/* This is not generated by the kernel as of now. */
|
|
|
|
case __SI_RT >> 16:
|
|
|
|
case __SI_MESGQ >> 16:
|
|
|
|
put_user_ex(from->si_uid, &to->si_uid);
|
|
|
|
put_user_ex(from->si_int, &to->si_int);
|
|
|
|
break;
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2009-01-24 00:50:38 +01:00
|
|
|
} put_user_catch(err);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
|
|
|
|
{
|
2009-01-24 00:50:38 +01:00
|
|
|
int err = 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
u32 ptr32;
|
2008-01-30 13:30:07 +01:00
|
|
|
|
|
|
|
if (!access_ok(VERIFY_READ, from, sizeof(compat_siginfo_t)))
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EFAULT;
|
|
|
|
|
2009-01-24 00:50:38 +01:00
|
|
|
get_user_try {
|
|
|
|
get_user_ex(to->si_signo, &from->si_signo);
|
|
|
|
get_user_ex(to->si_errno, &from->si_errno);
|
|
|
|
get_user_ex(to->si_code, &from->si_code);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-01-24 00:50:38 +01:00
|
|
|
get_user_ex(to->si_pid, &from->si_pid);
|
|
|
|
get_user_ex(to->si_uid, &from->si_uid);
|
|
|
|
get_user_ex(ptr32, &from->si_ptr);
|
|
|
|
to->si_ptr = compat_ptr(ptr32);
|
|
|
|
} get_user_catch(err);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Do a signal return; undo the signal stack.
|
|
|
|
*/
|
2009-02-21 04:00:54 +01:00
|
|
|
#define loadsegment_gs(v) load_gs_index(v)
|
|
|
|
#define loadsegment_fs(v) loadsegment(fs, v)
|
|
|
|
#define loadsegment_ds(v) loadsegment(ds, v)
|
|
|
|
#define loadsegment_es(v) loadsegment(es, v)
|
|
|
|
|
|
|
|
#define get_user_seg(seg) ({ unsigned int v; savesegment(seg, v); v; })
|
|
|
|
#define set_user_seg(seg, v) loadsegment_##seg(v)
|
|
|
|
|
2008-11-18 00:44:50 +01:00
|
|
|
#define COPY(x) { \
|
2009-01-24 00:50:38 +01:00
|
|
|
get_user_ex(regs->x, &sc->x); \
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2009-02-21 04:00:13 +01:00
|
|
|
#define GET_SEG(seg) ({ \
|
|
|
|
unsigned short tmp; \
|
|
|
|
get_user_ex(tmp, &sc->seg); \
|
|
|
|
tmp; \
|
|
|
|
})
|
|
|
|
|
|
|
|
#define COPY_SEG_CPL3(seg) do { \
|
|
|
|
regs->seg = GET_SEG(seg) | 3; \
|
|
|
|
} while (0)
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-11-18 00:47:48 +01:00
|
|
|
#define RELOAD_SEG(seg) { \
|
2009-02-21 04:00:54 +01:00
|
|
|
unsigned int pre = GET_SEG(seg); \
|
|
|
|
unsigned int cur = get_user_seg(seg); \
|
2008-11-18 00:47:48 +01:00
|
|
|
pre |= 3; \
|
|
|
|
if (pre != cur) \
|
2009-02-21 04:00:54 +01:00
|
|
|
set_user_seg(seg, pre); \
|
2008-11-18 00:47:48 +01:00
|
|
|
}
|
2008-01-30 13:30:07 +01:00
|
|
|
|
|
|
|
static int ia32_restore_sigcontext(struct pt_regs *regs,
|
|
|
|
struct sigcontext_ia32 __user *sc,
|
2008-11-18 00:48:27 +01:00
|
|
|
unsigned int *pax)
|
2008-01-30 13:30:07 +01:00
|
|
|
{
|
2009-02-21 04:00:54 +01:00
|
|
|
unsigned int tmpflags, err = 0;
|
2008-07-29 19:29:22 +02:00
|
|
|
void __user *buf;
|
2008-01-30 13:30:07 +01:00
|
|
|
u32 tmp;
|
|
|
|
|
|
|
|
/* Always make any pending restarted system calls return -EINTR */
|
|
|
|
current_thread_info()->restart_block.fn = do_no_restart_syscall;
|
|
|
|
|
2009-01-24 00:50:38 +01:00
|
|
|
get_user_try {
|
|
|
|
/*
|
|
|
|
* Reload fs and gs if they have changed in the signal
|
|
|
|
* handler. This does not handle long fs/gs base changes in
|
|
|
|
* the handler, but does not clobber them at least in the
|
|
|
|
* normal case.
|
|
|
|
*/
|
2009-02-21 04:00:54 +01:00
|
|
|
RELOAD_SEG(gs);
|
2009-01-24 00:50:38 +01:00
|
|
|
RELOAD_SEG(fs);
|
|
|
|
RELOAD_SEG(ds);
|
|
|
|
RELOAD_SEG(es);
|
|
|
|
|
|
|
|
COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);
|
|
|
|
COPY(dx); COPY(cx); COPY(ip);
|
|
|
|
/* Don't touch extended registers */
|
|
|
|
|
|
|
|
COPY_SEG_CPL3(cs);
|
|
|
|
COPY_SEG_CPL3(ss);
|
|
|
|
|
|
|
|
get_user_ex(tmpflags, &sc->flags);
|
|
|
|
regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);
|
|
|
|
/* disable syscall checks */
|
|
|
|
regs->orig_ax = -1;
|
|
|
|
|
|
|
|
get_user_ex(tmp, &sc->fpstate);
|
|
|
|
buf = compat_ptr(tmp);
|
|
|
|
|
|
|
|
get_user_ex(*pax, &sc->ax);
|
|
|
|
} get_user_catch(err);
|
|
|
|
|
2012-09-22 02:18:44 +02:00
|
|
|
err |= restore_xstate_sig(buf, 1);
|
2012-09-21 21:43:15 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2012-11-12 20:32:42 +01:00
|
|
|
asmlinkage long sys32_sigreturn(void)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2012-11-12 20:32:42 +01:00
|
|
|
struct pt_regs *regs = current_pt_regs();
|
2008-12-18 03:51:46 +01:00
|
|
|
struct sigframe_ia32 __user *frame = (struct sigframe_ia32 __user *)(regs->sp-8);
|
2005-04-17 00:20:36 +02:00
|
|
|
sigset_t set;
|
2008-01-30 13:30:56 +01:00
|
|
|
unsigned int ax;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
|
|
|
|
goto badframe;
|
|
|
|
if (__get_user(set.sig[0], &frame->sc.oldmask)
|
|
|
|
|| (_COMPAT_NSIG_WORDS > 1
|
2008-01-30 13:30:07 +01:00
|
|
|
&& __copy_from_user((((char *) &set.sig) + 4),
|
|
|
|
&frame->extramask,
|
2005-04-17 00:20:36 +02:00
|
|
|
sizeof(frame->extramask))))
|
|
|
|
goto badframe;
|
|
|
|
|
2011-07-10 21:27:24 +02:00
|
|
|
set_current_blocked(&set);
|
2008-01-30 13:30:07 +01:00
|
|
|
|
2008-01-30 13:30:56 +01:00
|
|
|
if (ia32_restore_sigcontext(regs, &frame->sc, &ax))
|
2005-04-17 00:20:36 +02:00
|
|
|
goto badframe;
|
2008-01-30 13:30:56 +01:00
|
|
|
return ax;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
badframe:
|
|
|
|
signal_fault(regs, frame, "32bit sigreturn");
|
|
|
|
return 0;
|
2008-01-30 13:30:07 +01:00
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2012-11-12 20:32:42 +01:00
|
|
|
asmlinkage long sys32_rt_sigreturn(void)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2012-11-12 20:32:42 +01:00
|
|
|
struct pt_regs *regs = current_pt_regs();
|
2008-12-18 03:51:46 +01:00
|
|
|
struct rt_sigframe_ia32 __user *frame;
|
2005-04-17 00:20:36 +02:00
|
|
|
sigset_t set;
|
2008-01-30 13:30:56 +01:00
|
|
|
unsigned int ax;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-12-18 03:51:46 +01:00
|
|
|
frame = (struct rt_sigframe_ia32 __user *)(regs->sp - 4);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
|
|
|
|
goto badframe;
|
|
|
|
if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
|
|
|
|
goto badframe;
|
|
|
|
|
2011-07-10 21:27:24 +02:00
|
|
|
set_current_blocked(&set);
|
2008-01-30 13:30:07 +01:00
|
|
|
|
2008-01-30 13:30:56 +01:00
|
|
|
if (ia32_restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax))
|
2005-04-17 00:20:36 +02:00
|
|
|
goto badframe;
|
|
|
|
|
2012-12-14 20:47:53 +01:00
|
|
|
if (compat_restore_altstack(&frame->uc.uc_stack))
|
2005-04-17 00:20:36 +02:00
|
|
|
goto badframe;
|
|
|
|
|
2008-01-30 13:30:56 +01:00
|
|
|
return ax;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
badframe:
|
2008-01-30 13:30:07 +01:00
|
|
|
signal_fault(regs, frame, "32bit rt sigreturn");
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
2008-01-30 13:30:07 +01:00
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Set up a signal frame.
|
|
|
|
*/
|
|
|
|
|
2008-01-30 13:30:07 +01:00
|
|
|
static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
|
2008-07-29 19:29:22 +02:00
|
|
|
void __user *fpstate,
|
2008-01-30 13:30:07 +01:00
|
|
|
struct pt_regs *regs, unsigned int mask)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2009-02-21 04:00:54 +01:00
|
|
|
int err = 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-01-24 00:50:38 +01:00
|
|
|
put_user_try {
|
2009-02-21 04:00:54 +01:00
|
|
|
put_user_ex(get_user_seg(gs), (unsigned int __user *)&sc->gs);
|
|
|
|
put_user_ex(get_user_seg(fs), (unsigned int __user *)&sc->fs);
|
|
|
|
put_user_ex(get_user_seg(ds), (unsigned int __user *)&sc->ds);
|
|
|
|
put_user_ex(get_user_seg(es), (unsigned int __user *)&sc->es);
|
2009-01-24 00:50:38 +01:00
|
|
|
|
|
|
|
put_user_ex(regs->di, &sc->di);
|
|
|
|
put_user_ex(regs->si, &sc->si);
|
|
|
|
put_user_ex(regs->bp, &sc->bp);
|
|
|
|
put_user_ex(regs->sp, &sc->sp);
|
|
|
|
put_user_ex(regs->bx, &sc->bx);
|
|
|
|
put_user_ex(regs->dx, &sc->dx);
|
|
|
|
put_user_ex(regs->cx, &sc->cx);
|
|
|
|
put_user_ex(regs->ax, &sc->ax);
|
2012-03-12 10:25:55 +01:00
|
|
|
put_user_ex(current->thread.trap_nr, &sc->trapno);
|
2009-01-24 00:50:38 +01:00
|
|
|
put_user_ex(current->thread.error_code, &sc->err);
|
|
|
|
put_user_ex(regs->ip, &sc->ip);
|
|
|
|
put_user_ex(regs->cs, (unsigned int __user *)&sc->cs);
|
|
|
|
put_user_ex(regs->flags, &sc->flags);
|
|
|
|
put_user_ex(regs->sp, &sc->sp_at_signal);
|
|
|
|
put_user_ex(regs->ss, (unsigned int __user *)&sc->ss);
|
|
|
|
|
|
|
|
put_user_ex(ptr_to_compat(fpstate), &sc->fpstate);
|
|
|
|
|
|
|
|
/* non-iBCS2 extensions.. */
|
|
|
|
put_user_ex(mask, &sc->oldmask);
|
|
|
|
put_user_ex(current->thread.cr2, &sc->cr2);
|
|
|
|
} put_user_catch(err);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Determine which stack to use..
|
|
|
|
*/
|
2012-11-10 05:51:47 +01:00
|
|
|
static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
|
2008-07-29 19:29:21 +02:00
|
|
|
size_t frame_size,
|
2012-09-02 23:31:42 +02:00
|
|
|
void __user **fpstate)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2008-01-30 13:30:56 +01:00
|
|
|
unsigned long sp;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* Default to using normal stack */
|
2008-01-30 13:30:56 +01:00
|
|
|
sp = regs->sp;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* This is the X/Open sanctioned signal stack switching. */
|
2012-11-10 05:51:47 +01:00
|
|
|
if (ksig->ka.sa.sa_flags & SA_ONSTACK)
|
|
|
|
sp = sigsp(sp, ksig);
|
2005-04-17 00:20:36 +02:00
|
|
|
/* This is the legacy signal stack switching. */
|
2008-12-16 23:04:43 +01:00
|
|
|
else if ((regs->ss & 0xffff) != __USER32_DS &&
|
2012-11-10 05:51:47 +01:00
|
|
|
!(ksig->ka.sa.sa_flags & SA_RESTORER) &&
|
|
|
|
ksig->ka.sa.sa_restorer)
|
|
|
|
sp = (unsigned long) ksig->ka.sa.sa_restorer;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-07-29 19:29:21 +02:00
|
|
|
if (used_math()) {
|
x86, fpu: Unify signal handling code paths for x86 and x86_64 kernels
Currently for x86 and x86_32 binaries, fpstate in the user sigframe is copied
to/from the fpstate in the task struct.
And in the case of signal delivery for x86_64 binaries, if the fpstate is live
in the CPU registers, then the live state is copied directly to the user
sigframe. Otherwise fpstate in the task struct is copied to the user sigframe.
During restore, fpstate in the user sigframe is restored directly to the live
CPU registers.
Historically, different code paths led to different bugs. For example,
x86_64 code path was not preemption safe till recently. Also there is lot
of code duplication for support of new features like xsave etc.
Unify signal handling code paths for x86 and x86_64 kernels.
New strategy is as follows:
Signal delivery: Both for 32/64-bit frames, align the core math frame area to
64bytes as needed by xsave (this where the main fpu/extended state gets copied
to and excludes the legacy compatibility fsave header for the 32-bit [f]xsave
frames). If the state is live, copy the register state directly to the user
frame. If not live, copy the state in the thread struct to the user frame. And
for 32-bit [f]xsave frames, construct the fsave header separately before
the actual [f]xsave area.
Signal return: As the 32-bit frames with [f]xstate has an additional
'fsave' header, copy everything back from the user sigframe to the
fpstate in the task structure and reconstruct the fxstate from the 'fsave'
header (Also user passed pointers may not be correctly aligned for
any attempt to directly restore any partial state). At the next fpstate usage,
everything will be restored to the live CPU registers.
For all the 64-bit frames and the 32-bit fsave frame, restore the state from
the user sigframe directly to the live CPU registers. 64-bit signals always
restored the math frame directly, so we can expect the math frame pointer
to be correctly aligned. For 32-bit fsave frames, there are no alignment
requirements, so we can restore the state directly.
"lat_sig catch" microbenchmark numbers (for x86, x86_64, x86_32 binaries) are
with in the noise range with this change.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Link: http://lkml.kernel.org/r/1343171129-2747-4-git-send-email-suresh.b.siddha@intel.com
[ Merged in compilation fix ]
Link: http://lkml.kernel.org/r/1344544736.8326.17.camel@sbsiddha-desk.sc.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2012-07-25 01:05:29 +02:00
|
|
|
unsigned long fx_aligned, math_size;
|
|
|
|
|
|
|
|
sp = alloc_mathframe(sp, 1, &fx_aligned, &math_size);
|
2012-09-02 23:31:42 +02:00
|
|
|
*fpstate = (struct _fpstate_ia32 __user *) sp;
|
x86, fpu: Unify signal handling code paths for x86 and x86_64 kernels
Currently for x86 and x86_32 binaries, fpstate in the user sigframe is copied
to/from the fpstate in the task struct.
And in the case of signal delivery for x86_64 binaries, if the fpstate is live
in the CPU registers, then the live state is copied directly to the user
sigframe. Otherwise fpstate in the task struct is copied to the user sigframe.
During restore, fpstate in the user sigframe is restored directly to the live
CPU registers.
Historically, different code paths led to different bugs. For example,
x86_64 code path was not preemption safe till recently. Also there is lot
of code duplication for support of new features like xsave etc.
Unify signal handling code paths for x86 and x86_64 kernels.
New strategy is as follows:
Signal delivery: Both for 32/64-bit frames, align the core math frame area to
64bytes as needed by xsave (this where the main fpu/extended state gets copied
to and excludes the legacy compatibility fsave header for the 32-bit [f]xsave
frames). If the state is live, copy the register state directly to the user
frame. If not live, copy the state in the thread struct to the user frame. And
for 32-bit [f]xsave frames, construct the fsave header separately before
the actual [f]xsave area.
Signal return: As the 32-bit frames with [f]xstate has an additional
'fsave' header, copy everything back from the user sigframe to the
fpstate in the task structure and reconstruct the fxstate from the 'fsave'
header (Also user passed pointers may not be correctly aligned for
any attempt to directly restore any partial state). At the next fpstate usage,
everything will be restored to the live CPU registers.
For all the 64-bit frames and the 32-bit fsave frame, restore the state from
the user sigframe directly to the live CPU registers. 64-bit signals always
restored the math frame directly, so we can expect the math frame pointer
to be correctly aligned. For 32-bit fsave frames, there are no alignment
requirements, so we can restore the state directly.
"lat_sig catch" microbenchmark numbers (for x86, x86_64, x86_32 binaries) are
with in the noise range with this change.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Link: http://lkml.kernel.org/r/1343171129-2747-4-git-send-email-suresh.b.siddha@intel.com
[ Merged in compilation fix ]
Link: http://lkml.kernel.org/r/1344544736.8326.17.camel@sbsiddha-desk.sc.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2012-07-25 01:05:29 +02:00
|
|
|
if (save_xstate_sig(*fpstate, (void __user *)fx_aligned,
|
|
|
|
math_size) < 0)
|
2008-11-06 03:32:54 +01:00
|
|
|
return (void __user *) -1L;
|
2008-07-29 19:29:21 +02:00
|
|
|
}
|
|
|
|
|
2008-01-30 13:30:56 +01:00
|
|
|
sp -= frame_size;
|
2005-10-09 18:54:23 +02:00
|
|
|
/* Align the stack pointer according to the i386 ABI,
|
|
|
|
* i.e. so that on function entry ((sp + 4) & 15) == 0. */
|
2008-01-30 13:30:56 +01:00
|
|
|
sp = ((sp + 4) & -16ul) - 4;
|
|
|
|
return (void __user *) sp;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2012-11-10 05:51:47 +01:00
|
|
|
int ia32_setup_frame(int sig, struct ksignal *ksig,
|
2008-01-30 13:30:07 +01:00
|
|
|
compat_sigset_t *set, struct pt_regs *regs)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2008-12-18 03:51:46 +01:00
|
|
|
struct sigframe_ia32 __user *frame;
|
2008-01-30 13:30:07 +01:00
|
|
|
void __user *restorer;
|
2005-04-17 00:20:36 +02:00
|
|
|
int err = 0;
|
2008-07-29 19:29:22 +02:00
|
|
|
void __user *fpstate = NULL;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-01-30 13:30:07 +01:00
|
|
|
/* copy_to_user optimizes that into a single 8 byte store */
|
|
|
|
static const struct {
|
|
|
|
u16 poplmovl;
|
|
|
|
u32 val;
|
|
|
|
u16 int80;
|
|
|
|
} __attribute__((packed)) code = {
|
|
|
|
0xb858, /* popl %eax ; movl $...,%eax */
|
|
|
|
__NR_ia32_sigreturn,
|
|
|
|
0x80cd, /* int $0x80 */
|
|
|
|
};
|
|
|
|
|
2012-11-10 05:51:47 +01:00
|
|
|
frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
|
2008-09-13 02:01:09 +02:00
|
|
|
return -EFAULT;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-09-13 02:02:53 +02:00
|
|
|
if (__put_user(sig, &frame->sig))
|
2008-09-13 02:01:09 +02:00
|
|
|
return -EFAULT;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-09-13 02:02:53 +02:00
|
|
|
if (ia32_setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]))
|
2008-09-13 02:01:09 +02:00
|
|
|
return -EFAULT;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (_COMPAT_NSIG_WORDS > 1) {
|
2008-09-13 02:02:53 +02:00
|
|
|
if (__copy_to_user(frame->extramask, &set->sig[1],
|
|
|
|
sizeof(frame->extramask)))
|
2008-09-13 02:01:09 +02:00
|
|
|
return -EFAULT;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2012-11-10 05:51:47 +01:00
|
|
|
if (ksig->ka.sa.sa_flags & SA_RESTORER) {
|
|
|
|
restorer = ksig->ka.sa.sa_restorer;
|
2008-01-30 13:30:43 +01:00
|
|
|
} else {
|
|
|
|
/* Return stub is in 32bit vsyscall page */
|
2008-04-09 10:29:27 +02:00
|
|
|
if (current->mm->context.vdso)
|
x86, vdso: Reimplement vdso.so preparation in build-time C
Currently, vdso.so files are prepared and analyzed by a combination
of objcopy, nm, some linker script tricks, and some simple ELF
parsers in the kernel. Replace all of that with plain C code that
runs at build time.
All five vdso images now generate .c files that are compiled and
linked in to the kernel image.
This should cause only one userspace-visible change: the loaded vDSO
images are stripped more heavily than they used to be. Everything
outside the loadable segment is dropped. In particular, this causes
the section table and section name strings to be missing. This
should be fine: real dynamic loaders don't load or inspect these
tables anyway. The result is roughly equivalent to eu-strip's
--strip-sections option.
The purpose of this change is to enable the vvar and hpet mappings
to be moved to the page following the vDSO load segment. Currently,
it is possible for the section table to extend into the page after
the load segment, so, if we map it, it risks overlapping the vvar or
hpet page. This happens whenever the load segment is just under a
multiple of PAGE_SIZE.
The only real subtlety here is that the old code had a C file with
inline assembler that did 'call VDSO32_vsyscall' and a linker script
that defined 'VDSO32_vsyscall = __kernel_vsyscall'. This most
likely worked by accident: the linker script entry defines a symbol
associated with an address as opposed to an alias for the real
dynamic symbol __kernel_vsyscall. That caused ld to relocate the
reference at link time instead of leaving an interposable dynamic
relocation. Since the VDSO32_vsyscall hack is no longer needed, I
now use 'call __kernel_vsyscall', and I added -Bsymbolic to make it
work. vdso2c will generate an error and abort the build if the
resulting image contains any dynamic relocations, so we won't
silently generate bad vdso images.
(Dynamic relocations are a problem because nothing will even attempt
to relocate the vdso.)
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/2c4fcf45524162a34d87fdda1eb046b2a5cecee7.1399317206.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2014-05-05 21:19:34 +02:00
|
|
|
restorer = current->mm->context.vdso +
|
|
|
|
selected_vdso32->sym___kernel_sigreturn;
|
2008-01-30 13:30:43 +01:00
|
|
|
else
|
2008-01-30 13:33:23 +01:00
|
|
|
restorer = &frame->retcode;
|
2008-01-30 13:30:43 +01:00
|
|
|
}
|
2008-01-30 13:30:07 +01:00
|
|
|
|
2009-01-24 00:50:38 +01:00
|
|
|
put_user_try {
|
|
|
|
put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* These are actually not used anymore, but left because some
|
|
|
|
* gdb versions depend on them as a marker.
|
|
|
|
*/
|
2012-09-02 23:31:42 +02:00
|
|
|
put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
|
2009-01-24 00:50:38 +01:00
|
|
|
} put_user_catch(err);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (err)
|
2008-09-13 02:01:09 +02:00
|
|
|
return -EFAULT;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* Set up registers for signal handler */
|
2008-01-30 13:30:56 +01:00
|
|
|
regs->sp = (unsigned long) frame;
|
2012-11-10 05:51:47 +01:00
|
|
|
regs->ip = (unsigned long) ksig->ka.sa.sa_handler;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-26 10:52:41 +02:00
|
|
|
/* Make -mregparm=3 work */
|
2008-01-30 13:30:56 +01:00
|
|
|
regs->ax = sig;
|
|
|
|
regs->dx = 0;
|
|
|
|
regs->cx = 0;
|
2006-09-26 10:52:41 +02:00
|
|
|
|
2008-08-19 22:04:19 +02:00
|
|
|
loadsegment(ds, __USER32_DS);
|
|
|
|
loadsegment(es, __USER32_DS);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-01-30 13:30:07 +01:00
|
|
|
regs->cs = __USER32_CS;
|
|
|
|
regs->ss = __USER32_DS;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-26 10:52:26 +02:00
|
|
|
return 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2012-11-10 05:51:47 +01:00
|
|
|
int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
|
2008-01-30 13:30:07 +01:00
|
|
|
compat_sigset_t *set, struct pt_regs *regs)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2008-12-18 03:51:46 +01:00
|
|
|
struct rt_sigframe_ia32 __user *frame;
|
2008-01-30 13:30:43 +01:00
|
|
|
void __user *restorer;
|
2005-04-17 00:20:36 +02:00
|
|
|
int err = 0;
|
2008-07-29 19:29:22 +02:00
|
|
|
void __user *fpstate = NULL;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-01-30 13:30:07 +01:00
|
|
|
/* __copy_to_user optimizes that into a single 8 byte store */
|
|
|
|
static const struct {
|
|
|
|
u8 movl;
|
|
|
|
u32 val;
|
|
|
|
u16 int80;
|
2008-11-12 04:11:39 +01:00
|
|
|
u8 pad;
|
2008-01-30 13:30:07 +01:00
|
|
|
} __attribute__((packed)) code = {
|
|
|
|
0xb8,
|
|
|
|
__NR_ia32_rt_sigreturn,
|
|
|
|
0x80cd,
|
|
|
|
0,
|
|
|
|
};
|
|
|
|
|
2012-11-10 05:51:47 +01:00
|
|
|
frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
|
2008-09-13 02:01:09 +02:00
|
|
|
return -EFAULT;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-01-24 00:50:38 +01:00
|
|
|
put_user_try {
|
|
|
|
put_user_ex(sig, &frame->sig);
|
|
|
|
put_user_ex(ptr_to_compat(&frame->info), &frame->pinfo);
|
|
|
|
put_user_ex(ptr_to_compat(&frame->uc), &frame->puc);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-01-24 00:50:38 +01:00
|
|
|
/* Create the ucontext. */
|
|
|
|
if (cpu_has_xsave)
|
|
|
|
put_user_ex(UC_FP_XSTATE, &frame->uc.uc_flags);
|
|
|
|
else
|
|
|
|
put_user_ex(0, &frame->uc.uc_flags);
|
|
|
|
put_user_ex(0, &frame->uc.uc_link);
|
2013-09-01 21:35:01 +02:00
|
|
|
compat_save_altstack_ex(&frame->uc.uc_stack, regs->sp);
|
2009-01-24 00:50:38 +01:00
|
|
|
|
2012-11-10 05:51:47 +01:00
|
|
|
if (ksig->ka.sa.sa_flags & SA_RESTORER)
|
|
|
|
restorer = ksig->ka.sa.sa_restorer;
|
2009-01-24 00:50:38 +01:00
|
|
|
else
|
x86, vdso: Reimplement vdso.so preparation in build-time C
Currently, vdso.so files are prepared and analyzed by a combination
of objcopy, nm, some linker script tricks, and some simple ELF
parsers in the kernel. Replace all of that with plain C code that
runs at build time.
All five vdso images now generate .c files that are compiled and
linked in to the kernel image.
This should cause only one userspace-visible change: the loaded vDSO
images are stripped more heavily than they used to be. Everything
outside the loadable segment is dropped. In particular, this causes
the section table and section name strings to be missing. This
should be fine: real dynamic loaders don't load or inspect these
tables anyway. The result is roughly equivalent to eu-strip's
--strip-sections option.
The purpose of this change is to enable the vvar and hpet mappings
to be moved to the page following the vDSO load segment. Currently,
it is possible for the section table to extend into the page after
the load segment, so, if we map it, it risks overlapping the vvar or
hpet page. This happens whenever the load segment is just under a
multiple of PAGE_SIZE.
The only real subtlety here is that the old code had a C file with
inline assembler that did 'call VDSO32_vsyscall' and a linker script
that defined 'VDSO32_vsyscall = __kernel_vsyscall'. This most
likely worked by accident: the linker script entry defines a symbol
associated with an address as opposed to an alias for the real
dynamic symbol __kernel_vsyscall. That caused ld to relocate the
reference at link time instead of leaving an interposable dynamic
relocation. Since the VDSO32_vsyscall hack is no longer needed, I
now use 'call __kernel_vsyscall', and I added -Bsymbolic to make it
work. vdso2c will generate an error and abort the build if the
resulting image contains any dynamic relocations, so we won't
silently generate bad vdso images.
(Dynamic relocations are a problem because nothing will even attempt
to relocate the vdso.)
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/2c4fcf45524162a34d87fdda1eb046b2a5cecee7.1399317206.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2014-05-05 21:19:34 +02:00
|
|
|
restorer = current->mm->context.vdso +
|
|
|
|
selected_vdso32->sym___kernel_rt_sigreturn;
|
2009-01-24 00:50:38 +01:00
|
|
|
put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Not actually used anymore, but left because some gdb
|
|
|
|
* versions need it.
|
|
|
|
*/
|
2012-09-02 23:31:42 +02:00
|
|
|
put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
|
2009-01-24 00:50:38 +01:00
|
|
|
} put_user_catch(err);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2012-11-10 05:51:47 +01:00
|
|
|
err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
|
2012-09-21 21:43:15 +02:00
|
|
|
err |= ia32_setup_sigcontext(&frame->uc.uc_mcontext, fpstate,
|
|
|
|
regs, set->sig[0]);
|
|
|
|
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (err)
|
2008-09-13 02:01:09 +02:00
|
|
|
return -EFAULT;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* Set up registers for signal handler */
|
2008-01-30 13:30:56 +01:00
|
|
|
regs->sp = (unsigned long) frame;
|
2012-11-10 05:51:47 +01:00
|
|
|
regs->ip = (unsigned long) ksig->ka.sa.sa_handler;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-10-30 04:26:17 +01:00
|
|
|
/* Make -mregparm=3 work */
|
2008-01-30 13:30:56 +01:00
|
|
|
regs->ax = sig;
|
|
|
|
regs->dx = (unsigned long) &frame->info;
|
|
|
|
regs->cx = (unsigned long) &frame->uc;
|
2006-10-30 04:26:17 +01:00
|
|
|
|
2008-08-19 22:04:19 +02:00
|
|
|
loadsegment(ds, __USER32_DS);
|
|
|
|
loadsegment(es, __USER32_DS);
|
2008-01-30 13:30:07 +01:00
|
|
|
|
|
|
|
regs->cs = __USER32_CS;
|
|
|
|
regs->ss = __USER32_DS;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-09-26 10:52:26 +02:00
|
|
|
return 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|