Skip to content

L
linux-davinci
Commit 99b9cdf7 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files
Options

x86: clean up arch/x86/ia32/ia32_signal.c 

White space and coding style clenaup.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8edf8bee
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 188 deletions
arch/x86/ia32/ia32_signal.c
View file @ 99b9cdf7
...@@ -43,7 +43,8 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where); ...@@ -43,7 +43,8 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from) int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
{ {
int err; int err;
if (!access_ok (VERIFY_WRITE, to, sizeof(compat_siginfo_t)))
if (!access_ok(VERIFY_WRITE, to, sizeof(compat_siginfo_t)))
return -EFAULT; return -EFAULT;
/* If you change siginfo_t structure, please make sure that /* If you change siginfo_t structure, please make sure that
...@@ -53,16 +54,19 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from) ...@@ -53,16 +54,19 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
3 ints plus the relevant union member. */ 3 ints plus the relevant union member. */
err = __put_user(from->si_signo, &to->si_signo); err = __put_user(from->si_signo, &to->si_signo);
err |= __put_user(from->si_errno, &to->si_errno); err |= __put_user(from->si_errno, &to->si_errno);
err |= __put_user((short)from->si_code, &to->si_code); err |= __put_user((short)from->si_code, &to->si_code);
if (from->si_code < 0) { if (from->si_code < 0) {
err |= __put_user(from->si_pid, &to->si_pid); err |= __put_user(from->si_pid, &to->si_pid);
err |= __put_user(from->si_uid, &to->si_uid); err |= __put_user(from->si_uid, &to->si_uid);
err |= __put_user(ptr_to_compat(from->si_ptr), &to->si_ptr); err |= __put_user(ptr_to_compat(from->si_ptr), &to->si_ptr);
} else { } else {
/* First 32bits of unions are always present: /*
* si_pid === si_band === si_tid === si_addr(LS half) */ * First 32bits of unions are always present:
err |= __put_user(from->_sifields._pad[0], &to->_sifields._pad[0]); * si_pid === si_band === si_tid === si_addr(LS half)
*/
err |= __put_user(from->_sifields._pad[0],
&to->_sifields._pad[0]);
switch (from->si_code >> 16) { switch (from->si_code >> 16) {
case __SI_FAULT >> 16: case __SI_FAULT >> 16:
break; break;
...@@ -76,14 +80,15 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from) ...@@ -76,14 +80,15 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
err |= __put_user(from->si_uid, &to->si_uid); err |= __put_user(from->si_uid, &to->si_uid);
break; break;
case __SI_POLL >> 16: case __SI_POLL >> 16:
err |= __put_user(from->si_fd, &to->si_fd); err |= __put_user(from->si_fd, &to->si_fd);
break; break;
case __SI_TIMER >> 16: case __SI_TIMER >> 16:
err |= __put_user(from->si_overrun, &to->si_overrun); err |= __put_user(from->si_overrun, &to->si_overrun);
err |= __put_user(ptr_to_compat(from->si_ptr), err |= __put_user(ptr_to_compat(from->si_ptr),
&to->si_ptr); &to->si_ptr);
break; break;
case __SI_RT >> 16: /* This is not generated by the kernel as of now. */ /* This is not generated by the kernel as of now. */
case __SI_RT >> 16:
case __SI_MESGQ >> 16: case __SI_MESGQ >> 16:
err |= __put_user(from->si_uid, &to->si_uid); err |= __put_user(from->si_uid, &to->si_uid);
err |= __put_user(from->si_int, &to->si_int); err |= __put_user(from->si_int, &to->si_int);
...@@ -97,7 +102,8 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) ...@@ -97,7 +102,8 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
{ {
int err; int err;
u32 ptr32; u32 ptr32;
if (!access_ok (VERIFY_READ, from, sizeof(compat_siginfo_t)))
if (!access_ok(VERIFY_READ, from, sizeof(compat_siginfo_t)))
return -EFAULT; return -EFAULT;
err = __get_user(to->si_signo, &from->si_signo); err = __get_user(to->si_signo, &from->si_signo);
...@@ -112,8 +118,7 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) ...@@ -112,8 +118,7 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
return err; return err;
} }
asmlinkage long asmlinkage long sys32_sigsuspend(int history0, int history1, old_sigset_t mask)
sys32_sigsuspend(int history0, int history1, old_sigset_t mask)
{ {
mask &= _BLOCKABLE; mask &= _BLOCKABLE;
spin_lock_irq(&current->sighand->siglock); spin_lock_irq(&current->sighand->siglock);
...@@ -128,36 +133,37 @@ sys32_sigsuspend(int history0, int history1, old_sigset_t mask) ...@@ -128,36 +133,37 @@ sys32_sigsuspend(int history0, int history1, old_sigset_t mask)
return -ERESTARTNOHAND; return -ERESTARTNOHAND;
} }
asmlinkage long asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
sys32_sigaltstack(const stack_ia32_t __user *uss_ptr, stack_ia32_t __user *uoss_ptr,
stack_ia32_t __user *uoss_ptr, struct pt_regs *regs)
struct pt_regs *regs)
{ {
stack_t uss,uoss; stack_t uss, uoss;
int ret; int ret;
mm_segment_t seg; mm_segment_t seg;
if (uss_ptr) {
if (uss_ptr) {
u32 ptr; u32 ptr;
memset(&uss,0,sizeof(stack_t));
if (!access_ok(VERIFY_READ,uss_ptr,sizeof(stack_ia32_t)) || memset(&uss, 0, sizeof(stack_t));
if (!access_ok(VERIFY_READ, uss_ptr, sizeof(stack_ia32_t)) ||
__get_user(ptr, &uss_ptr->ss_sp) || __get_user(ptr, &uss_ptr->ss_sp) ||
__get_user(uss.ss_flags, &uss_ptr->ss_flags) || __get_user(uss.ss_flags, &uss_ptr->ss_flags) ||
__get_user(uss.ss_size, &uss_ptr->ss_size)) __get_user(uss.ss_size, &uss_ptr->ss_size))
return -EFAULT; return -EFAULT;
uss.ss_sp = compat_ptr(ptr); uss.ss_sp = compat_ptr(ptr);
} }
seg = get_fs(); seg = get_fs();
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->rsp); ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->rsp);
set_fs(seg); set_fs(seg);
if (ret >= 0 && uoss_ptr) { if (ret >= 0 && uoss_ptr) {
if (!access_ok(VERIFY_WRITE,uoss_ptr,sizeof(stack_ia32_t)) || if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)) ||
__put_user(ptr_to_compat(uoss.ss_sp), &uoss_ptr->ss_sp) || __put_user(ptr_to_compat(uoss.ss_sp), &uoss_ptr->ss_sp) ||
__put_user(uoss.ss_flags, &uoss_ptr->ss_flags) || __put_user(uoss.ss_flags, &uoss_ptr->ss_flags) ||
__put_user(uoss.ss_size, &uoss_ptr->ss_size)) __put_user(uoss.ss_size, &uoss_ptr->ss_size))
ret = -EFAULT; ret = -EFAULT;
} }
return ret; return ret;
} }
/* /*
...@@ -186,18 +192,6 @@ struct rt_sigframe ...@@ -186,18 +192,6 @@ struct rt_sigframe
char retcode[8]; char retcode[8];
}; };
static int
ia32_restore_sigcontext(struct pt_regs *regs, struct sigcontext_ia32 __user *sc, unsigned 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;
#if DEBUG_SIG
printk("SIG restore_sigcontext: sc=%p err(%x) eip(%x) cs(%x) flg(%x)\n",
sc, sc->err, sc->eip, sc->cs, sc->eflags);
#endif
#define COPY(x) { \ #define COPY(x) { \
unsigned int reg; \ unsigned int reg; \
err |= __get_user(reg, &sc->e ##x); \ err |= __get_user(reg, &sc->e ##x); \
...@@ -205,68 +199,78 @@ ia32_restore_sigcontext(struct pt_regs *regs, struct sigcontext_ia32 __user *sc, ...@@ -205,68 +199,78 @@ ia32_restore_sigcontext(struct pt_regs *regs, struct sigcontext_ia32 __user *sc,
} }
#define RELOAD_SEG(seg,mask) \ #define RELOAD_SEG(seg,mask) \
{ unsigned int cur; \ { unsigned int cur; \
unsigned short pre; \ unsigned short pre; \
err |= __get_user(pre, &sc->seg); \ err |= __get_user(pre, &sc->seg); \
asm volatile("movl %%" #seg ",%0" : "=r" (cur)); \ asm volatile("movl %%" #seg ",%0" : "=r" (cur)); \
pre |= mask; \ pre |= mask; \
if (pre != cur) loadsegment(seg,pre); } if (pre != cur) loadsegment(seg, pre); }
/* Reload fs and gs if they have changed in the signal handler. static int ia32_restore_sigcontext(struct pt_regs *regs,
This does not handle long fs/gs base changes in the handler, but struct sigcontext_ia32 __user *sc,
does not clobber them at least in the normal case. */ unsigned int *peax)
{
{ unsigned int tmpflags, gs, oldgs, err = 0;
unsigned gs, oldgs; struct _fpstate_ia32 __user *buf;
err |= __get_user(gs, &sc->gs); u32 tmp;
gs |= 3;
asm("movl %%gs,%0" : "=r" (oldgs)); /* Always make any pending restarted system calls return -EINTR */
if (gs != oldgs) current_thread_info()->restart_block.fn = do_no_restart_syscall;
load_gs_index(gs);
} #if DEBUG_SIG
RELOAD_SEG(fs,3); printk(KERN_DEBUG "SIG restore_sigcontext: "
RELOAD_SEG(ds,3); "sc=%p err(%x) eip(%x) cs(%x) flg(%x)\n",
RELOAD_SEG(es,3); sc, sc->err, sc->eip, sc->cs, sc->eflags);
#endif
/*
* 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.
*/
err |= __get_user(gs, &sc->gs);
gs |= 3;
asm("movl %%gs,%0" : "=r" (oldgs));
if (gs != oldgs)
load_gs_index(gs);
RELOAD_SEG(fs, 3);
RELOAD_SEG(ds, 3);
RELOAD_SEG(es, 3);
COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx); COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);
COPY(dx); COPY(cx); COPY(ip); COPY(dx); COPY(cx); COPY(ip);
/* Don't touch extended registers */ /* Don't touch extended registers */
err |= __get_user(regs->cs, &sc->cs); err |= __get_user(regs->cs, &sc->cs);
regs->cs |= 3; regs->cs |= 3;
err |= __get_user(regs->ss, &sc->ss); err |= __get_user(regs->ss, &sc->ss);
regs->ss |= 3; regs->ss |= 3;
{ err |= __get_user(tmpflags, &sc->eflags);
unsigned int tmpflags; regs->eflags = (regs->eflags & ~0x40DD5) | (tmpflags & 0x40DD5);
err |= __get_user(tmpflags, &sc->eflags); /* disable syscall checks */
regs->eflags = (regs->eflags & ~0x40DD5) | (tmpflags & 0x40DD5); regs->orig_rax = -1;
regs->orig_rax = -1; /* disable syscall checks */
} err |= __get_user(tmp, &sc->fpstate);
buf = compat_ptr(tmp);
if (buf) {
if (!access_ok(VERIFY_READ, buf, sizeof(*buf)))
goto badframe;
err |= restore_i387_ia32(current, buf, 0);
} else {
struct task_struct *me = current;
{ if (used_math()) {
u32 tmp; clear_fpu(me);
struct _fpstate_ia32 __user * buf; clear_used_math();
err |= __get_user(tmp, &sc->fpstate);
buf = compat_ptr(tmp);
if (buf) {
if (!access_ok(VERIFY_READ, buf, sizeof(*buf)))
goto badframe;
err |= restore_i387_ia32(current, buf, 0);
} else {
struct task_struct *me = current;
if (used_math()) {
clear_fpu(me);
clear_used_math();
}
} }
} }
{ err |= __get_user(tmp, &sc->eax);
u32 tmp; *peax = tmp;
err |= __get_user(tmp, &sc->eax);
*peax = tmp;
}
return err; return err;
badframe: badframe:
...@@ -283,7 +287,8 @@ asmlinkage long sys32_sigreturn(struct pt_regs *regs) ...@@ -283,7 +287,8 @@ asmlinkage long sys32_sigreturn(struct pt_regs *regs)
goto badframe; goto badframe;
if (__get_user(set.sig[0], &frame->sc.oldmask) if (__get_user(set.sig[0], &frame->sc.oldmask)
|| (_COMPAT_NSIG_WORDS > 1 || (_COMPAT_NSIG_WORDS > 1
&& __copy_from_user((((char *) &set.sig) + 4), &frame->extramask, && __copy_from_user((((char *) &set.sig) + 4),
&frame->extramask,
sizeof(frame->extramask)))) sizeof(frame->extramask))))
goto badframe; goto badframe;
...@@ -292,7 +297,7 @@ asmlinkage long sys32_sigreturn(struct pt_regs *regs) ...@@ -292,7 +297,7 @@ asmlinkage long sys32_sigreturn(struct pt_regs *regs)
current->blocked = set; current->blocked = set;
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock); spin_unlock_irq(&current->sighand->siglock);
if (ia32_restore_sigcontext(regs, &frame->sc, &eax)) if (ia32_restore_sigcontext(regs, &frame->sc, &eax))
goto badframe; goto badframe;
return eax; return eax;
...@@ -300,7 +305,7 @@ asmlinkage long sys32_sigreturn(struct pt_regs *regs) ...@@ -300,7 +305,7 @@ asmlinkage long sys32_sigreturn(struct pt_regs *regs)
badframe: badframe:
signal_fault(regs, frame, "32bit sigreturn"); signal_fault(regs, frame, "32bit sigreturn");
return 0; return 0;
} }
asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs) asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs)
{ {
...@@ -321,7 +326,7 @@ asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs) ...@@ -321,7 +326,7 @@ asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs)
current->blocked = set; current->blocked = set;
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock); spin_unlock_irq(&current->sighand->siglock);
if (ia32_restore_sigcontext(regs, &frame->uc.uc_mcontext, &eax)) if (ia32_restore_sigcontext(regs, &frame->uc.uc_mcontext, &eax))
goto badframe; goto badframe;
...@@ -332,17 +337,17 @@ asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs) ...@@ -332,17 +337,17 @@ asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs)
return eax; return eax;
badframe: badframe:
signal_fault(regs,frame,"32bit rt sigreturn"); signal_fault(regs, frame, "32bit rt sigreturn");
return 0; return 0;
} }
/* /*
* Set up a signal frame. * Set up a signal frame.
*/ */
static int static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, struct _fpstate_ia32 __user *fpstate, struct _fpstate_ia32 __user *fpstate,
struct pt_regs *regs, unsigned int mask) struct pt_regs *regs, unsigned int mask)
{ {
int tmp, err = 0; int tmp, err = 0;
...@@ -375,7 +380,7 @@ ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, struct _fpstate_ia32 __ ...@@ -375,7 +380,7 @@ ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, struct _fpstate_ia32 __
tmp = save_i387_ia32(current, fpstate, regs, 0); tmp = save_i387_ia32(current, fpstate, regs, 0);
if (tmp < 0) if (tmp < 0)
err = -EFAULT; err = -EFAULT;
else { else {
clear_used_math(); clear_used_math();
stts(); stts();
err |= __put_user(ptr_to_compat(tmp ? fpstate : NULL), err |= __put_user(ptr_to_compat(tmp ? fpstate : NULL),
...@@ -392,8 +397,8 @@ ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, struct _fpstate_ia32 __ ...@@ -392,8 +397,8 @@ ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, struct _fpstate_ia32 __
/* /*
* Determine which stack to use.. * Determine which stack to use..
*/ */
static void __user * static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size) size_t frame_size)
{ {
unsigned long rsp; unsigned long rsp;
...@@ -409,9 +414,8 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size) ...@@ -409,9 +414,8 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
/* This is the legacy signal stack switching. */ /* This is the legacy signal stack switching. */
else if ((regs->ss & 0xffff) != __USER_DS && else if ((regs->ss & 0xffff) != __USER_DS &&
!(ka->sa.sa_flags & SA_RESTORER) && !(ka->sa.sa_flags & SA_RESTORER) &&
ka->sa.sa_restorer) { ka->sa.sa_restorer)
rsp = (unsigned long) ka->sa.sa_restorer; rsp = (unsigned long) ka->sa.sa_restorer;
}
rsp -= frame_size; rsp -= frame_size;
/* Align the stack pointer according to the i386 ABI, /* Align the stack pointer according to the i386 ABI,
...@@ -421,11 +425,25 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size) ...@@ -421,11 +425,25 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
} }
int ia32_setup_frame(int sig, struct k_sigaction *ka, int ia32_setup_frame(int sig, struct k_sigaction *ka,
compat_sigset_t *set, struct pt_regs * regs) compat_sigset_t *set, struct pt_regs *regs)
{ {
struct sigframe __user *frame; struct sigframe __user *frame;
void __user *restorer;
int err = 0; int err = 0;
/* copy_to_user optimizes that into a single 8 byte store */
static const struct {
u16 poplmovl;
u32 val;
u16 int80;
u16 pad;
} __attribute__((packed)) code = {
0xb858, /* popl %eax ; movl $...,%eax */
__NR_ia32_sigreturn,
0x80cd, /* int $0x80 */
0,
};
frame = get_sigframe(ka, regs, sizeof(*frame)); frame = get_sigframe(ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
...@@ -443,38 +461,24 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, ...@@ -443,38 +461,24 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
if (_COMPAT_NSIG_WORDS > 1) { if (_COMPAT_NSIG_WORDS > 1) {
err |= __copy_to_user(frame->extramask, &set->sig[1], err |= __copy_to_user(frame->extramask, &set->sig[1],
sizeof(frame->extramask)); sizeof(frame->extramask));
if (err)
goto give_sigsegv;
} }
if (err)
goto give_sigsegv;
/* Return stub is in 32bit vsyscall page */ /* Return stub is in 32bit vsyscall page */
{ if (current->binfmt->hasvdso)
void __user *restorer; restorer = VSYSCALL32_SIGRETURN;
if (current->binfmt->hasvdso) else
restorer = VSYSCALL32_SIGRETURN; restorer = (void *)&frame->retcode;
else if (ka->sa.sa_flags & SA_RESTORER)
restorer = (void *)&frame->retcode; restorer = ka->sa.sa_restorer;
if (ka->sa.sa_flags & SA_RESTORER) err |= __put_user(ptr_to_compat(restorer), &frame->pretcode);
restorer = ka->sa.sa_restorer;
err |= __put_user(ptr_to_compat(restorer), &frame->pretcode); /*
} * These are actually not used anymore, but left because some
/* These are actually not used anymore, but left because some * gdb versions depend on them as a marker.
gdb versions depend on them as a marker. */ */
{ err |= __copy_to_user(frame->retcode, &code, 8);
/* copy_to_user optimizes that into a single 8 byte store */
static const struct {
u16 poplmovl;
u32 val;
u16 int80;
u16 pad;
} __attribute__((packed)) code = {
0xb858, /* popl %eax ; movl $...,%eax */
__NR_ia32_sigreturn,
0x80cd, /* int $0x80 */
0,
};
err |= __copy_to_user(frame->retcode, &code, 8);
}
if (err) if (err)
goto give_sigsegv; goto give_sigsegv;
...@@ -487,11 +491,11 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, ...@@ -487,11 +491,11 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
regs->rdx = 0; regs->rdx = 0;
regs->rcx = 0; regs->rcx = 0;
asm volatile("movl %0,%%ds" :: "r" (__USER32_DS)); asm volatile("movl %0,%%ds" :: "r" (__USER32_DS));
asm volatile("movl %0,%%es" :: "r" (__USER32_DS)); asm volatile("movl %0,%%es" :: "r" (__USER32_DS));
regs->cs = __USER32_CS; regs->cs = __USER32_CS;
regs->ss = __USER32_DS; regs->ss = __USER32_DS;
set_fs(USER_DS); set_fs(USER_DS);
regs->eflags &= ~TF_MASK; regs->eflags &= ~TF_MASK;
...@@ -499,8 +503,8 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, ...@@ -499,8 +503,8 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
ptrace_notify(SIGTRAP); ptrace_notify(SIGTRAP);
#if DEBUG_SIG #if DEBUG_SIG
printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n", printk(KERN_DEBUG "SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n",
current->comm, current->pid, frame, regs->rip, frame->pretcode); current->comm, current->pid, frame, regs->rip, frame->pretcode);
#endif #endif
return 0; return 0;
...@@ -511,25 +515,34 @@ give_sigsegv: ...@@ -511,25 +515,34 @@ give_sigsegv:
} }
int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
compat_sigset_t *set, struct pt_regs * regs) compat_sigset_t *set, struct pt_regs *regs)
{ {
struct rt_sigframe __user *frame; struct rt_sigframe __user *frame;
struct exec_domain *ed = current_thread_info()->exec_domain;
void __user *restorer = VSYSCALL32_RTSIGRETURN;
int err = 0; int err = 0;
/* __copy_to_user optimizes that into a single 8 byte store */
static const struct {
u8 movl;
u32 val;
u16 int80;
u16 pad;
u8 pad2;
} __attribute__((packed)) code = {
0xb8,
__NR_ia32_rt_sigreturn,
0x80cd,
0,
};
frame = get_sigframe(ka, regs, sizeof(*frame)); frame = get_sigframe(ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
goto give_sigsegv; goto give_sigsegv;
{ err |= __put_user((ed && ed->signal_invmap && sig < 32
struct exec_domain *ed = current_thread_info()->exec_domain; ? ed->signal_invmap[sig] : sig), &frame->sig);
err |= __put_user((ed
&& ed->signal_invmap
&& sig < 32
? ed->signal_invmap[sig]
: sig),
&frame->sig);
}
err |= __put_user(ptr_to_compat(&frame->info), &frame->pinfo); err |= __put_user(ptr_to_compat(&frame->info), &frame->pinfo);
err |= __put_user(ptr_to_compat(&frame->uc), &frame->puc); err |= __put_user(ptr_to_compat(&frame->uc), &frame->puc);
err |= copy_siginfo_to_user32(&frame->info, info); err |= copy_siginfo_to_user32(&frame->info, info);
...@@ -544,38 +557,20 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, ...@@ -544,38 +557,20 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
&frame->uc.uc_stack.ss_flags); &frame->uc.uc_stack.ss_flags);
err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size); err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
err |= ia32_setup_sigcontext(&frame->uc.uc_mcontext, &frame->fpstate, err |= ia32_setup_sigcontext(&frame->uc.uc_mcontext, &frame->fpstate,
regs, set->sig[0]); regs, set->sig[0]);
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
if (err) if (err)
goto give_sigsegv; goto give_sigsegv;
if (ka->sa.sa_flags & SA_RESTORER)
{ restorer = ka->sa.sa_restorer;
void __user *restorer = VSYSCALL32_RTSIGRETURN; err |= __put_user(ptr_to_compat(restorer), &frame->pretcode);
if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer;
err |= __put_user(ptr_to_compat(restorer), &frame->pretcode);
}
/* This is movl $,%eax ; int $0x80 */ /*
/* Not actually used anymore, but left because some gdb versions * Not actually used anymore, but left because some gdb
need it. */ * versions need it.
{ */
/* __copy_to_user optimizes that into a single 8 byte store */ err |= __copy_to_user(frame->retcode, &code, 8);
static const struct {
u8 movl;
u32 val;
u16 int80;
u16 pad;
u8 pad2;
} __attribute__((packed)) code = {
0xb8,
__NR_ia32_rt_sigreturn,
0x80cd,
0,
};
err |= __copy_to_user(frame->retcode, &code, 8);
}
if (err) if (err)
goto give_sigsegv; goto give_sigsegv;
...@@ -593,11 +588,11 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, ...@@ -593,11 +588,11 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
regs->rdx = (unsigned long) &frame->info; regs->rdx = (unsigned long) &frame->info;
regs->rcx = (unsigned long) &frame->uc; regs->rcx = (unsigned long) &frame->uc;
asm volatile("movl %0,%%ds" :: "r" (__USER32_DS)); asm volatile("movl %0,%%ds" :: "r" (__USER32_DS));
asm volatile("movl %0,%%es" :: "r" (__USER32_DS)); asm volatile("movl %0,%%es" :: "r" (__USER32_DS));
regs->cs = __USER32_CS; regs->cs = __USER32_CS;
regs->ss = __USER32_DS; regs->ss = __USER32_DS;
set_fs(USER_DS); set_fs(USER_DS);
regs->eflags &= ~TF_MASK; regs->eflags &= ~TF_MASK;
...@@ -605,8 +600,8 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, ...@@ -605,8 +600,8 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
ptrace_notify(SIGTRAP); ptrace_notify(SIGTRAP);
#if DEBUG_SIG #if DEBUG_SIG
printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n", printk(KERN_DEBUG "SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n",
current->comm, current->pid, frame, regs->rip, frame->pretcode); current->comm, current->pid, frame, regs->rip, frame->pretcode);
#endif #endif
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment