patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / i386 / kernel / signal.c

diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c
index aa242e9..c231881 100644 (file)
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
@@ -231,7 +231,6 @@ 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;
-       stack_t st;
        int eax;
 
        if (verify_area(VERIFY_READ, frame, sizeof(*frame)))
@@ -248,16 +247,8 @@ asmlinkage int sys_rt_sigreturn(unsigned long __unused)
        if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &eax))
                goto badframe;
 
-       if (__copy_from_user(&st, &frame->uc.uc_stack, sizeof(st)))
+       if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->esp) == -EFAULT)
                goto badframe;
-       /* It is more difficult to avoid calling this function than to
-          call it and ignore errors.  */
-       /*
-        * THIS CANNOT WORK! "&st" is a kernel address, and "do_sigaltstack()"
-        * takes a user address (and verifies that it is a user address). End
-        * result: it does exactly _nothing_.
-        */
-       do_sigaltstack(&st, NULL, regs->esp);
 
        return eax;
 
@@ -278,12 +269,12 @@ setup_sigcontext(struct sigcontext __user *sc, struct _fpstate __user *fpstate,
 
        tmp = 0;
        __asm__("movl %%gs,%0" : "=r"(tmp): "0"(tmp));
-       err |= __put_user(tmp, (unsigned int *)&sc->gs);
+       err |= __put_user(tmp, (unsigned int __user *)&sc->gs);
        __asm__("movl %%fs,%0" : "=r"(tmp): "0"(tmp));
-       err |= __put_user(tmp, (unsigned int *)&sc->fs);
+       err |= __put_user(tmp, (unsigned int __user *)&sc->fs);
 
-       err |= __put_user(regs->xes, (unsigned int *)&sc->es);
-       err |= __put_user(regs->xds, (unsigned int *)&sc->ds);
+       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);
@@ -295,10 +286,10 @@ setup_sigcontext(struct sigcontext __user *sc, struct _fpstate __user *fpstate,
        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 *)&sc->cs);
+       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 *)&sc->ss);
+       err |= __put_user(regs->xss, (unsigned int __user *)&sc->ss);
 
        tmp = save_i387(fpstate);
        if (tmp < 0)
@@ -390,9 +381,9 @@ static void setup_frame(int sig, struct k_sigaction *ka,
         * reasons and because gdb uses it as a signature to notice
         * signal handler stack frames.
         */
-       err |= __put_user(0xb858, (short *)(frame->retcode+0));
-       err |= __put_user(__NR_sigreturn, (int *)(frame->retcode+2));
-       err |= __put_user(0x80cd, (short *)(frame->retcode+6));
+       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;
@@ -471,9 +462,9 @@ static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         * reasons and because gdb uses it as a signature to notice
         * signal handler stack frames.
         */
-       err |= __put_user(0xb8, (char *)(frame->retcode+0));
-       err |= __put_user(__NR_rt_sigreturn, (int *)(frame->retcode+1));
-       err |= __put_user(0x80cd, (short *)(frame->retcode+5));
+       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;