vserver 1.9.5.x5

[linux-2.6.git] / arch / x86_64 / ia32 / ia32_signal.c

diff --git a/arch/x86_64/ia32/ia32_signal.c b/arch/x86_64/ia32/ia32_signal.c
index 5fb7d17..85534e5 100644 (file)
--- a/arch/x86_64/ia32/ia32_signal.c
+++ b/arch/x86_64/ia32/ia32_signal.c
@@ -35,8 +35,6 @@
 #include <asm/proto.h>
 #include <asm/vsyscall32.h>
 
-#define ptr_to_u32(x) ((u32)(u64)(x))  /* avoid gcc warning */ 
-
 #define DEBUG_SIG 0
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
@@ -44,10 +42,10 @@
 asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset);
 void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
 
-int ia32_copy_siginfo_to_user(siginfo_t32 __user *to, siginfo_t *from)
+int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
 {
        int err;
-       if (!access_ok (VERIFY_WRITE, to, sizeof(siginfo_t32)))
+       if (!access_ok (VERIFY_WRITE, to, sizeof(compat_siginfo_t)))
                return -EFAULT;
 
        /* If you change siginfo_t structure, please make sure that
@@ -62,7 +60,7 @@ int ia32_copy_siginfo_to_user(siginfo_t32 __user *to, siginfo_t *from)
        if (from->si_code < 0) {
                err |= __put_user(from->si_pid, &to->si_pid);
                err |= __put_user(from->si_uid, &to->si_uid);
-               err |= __put_user((u32)(u64)from->si_ptr, &to->si_ptr);
+               err |= __put_user(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) */
@@ -83,7 +81,7 @@ int ia32_copy_siginfo_to_user(siginfo_t32 __user *to, siginfo_t *from)
                        break;
                case __SI_TIMER >> 16:
                        err |= __put_user(from->si_overrun, &to->si_overrun); 
-                       err |= __put_user((u32)(u64)from->si_ptr, &to->si_ptr);
+                       err |= __put_user(ptr_to_compat(from->si_ptr), &to->si_ptr);
                        break;
                case __SI_RT >> 16: /* This is not generated by the kernel as of now.  */
                case __SI_MESGQ >> 16:
@@ -95,11 +93,11 @@ int ia32_copy_siginfo_to_user(siginfo_t32 __user *to, siginfo_t *from)
        return err;
 }
 
-int ia32_copy_siginfo_from_user(siginfo_t *to, siginfo_t32 __user *from)
+int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
 {
        int err;
        u32 ptr32;
-       if (!access_ok (VERIFY_READ, from, sizeof(siginfo_t32)))
+       if (!access_ok (VERIFY_READ, from, sizeof(compat_siginfo_t)))
                return -EFAULT;
 
        err = __get_user(to->si_signo, &from->si_signo);
@@ -160,7 +158,7 @@ sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
        set_fs(seg); 
        if (ret >= 0 && uoss_ptr)  {
                if (!access_ok(VERIFY_WRITE,uoss_ptr,sizeof(stack_ia32_t)) ||
-                   __put_user((u32)(u64)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_size, &uoss_ptr->ss_size))
                        ret = -EFAULT;
@@ -188,7 +186,7 @@ struct rt_sigframe
        int sig;
        u32 pinfo;
        u32 puc;
-       struct siginfo32 info;
+       compat_siginfo_t info;
        struct ucontext_ia32 uc;
        struct _fpstate_ia32 fpstate;
        char retcode[8];
@@ -261,6 +259,12 @@ ia32_restore_sigcontext(struct pt_regs *regs, struct sigcontext_ia32 __user *sc,
                        if (verify_area(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();
+                       }
                }
        }
 
@@ -383,9 +387,9 @@ ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, struct _fpstate_ia32 __
        if (tmp < 0)
          err = -EFAULT;
        else { 
-               current->used_math = 0;
+               clear_used_math();
                stts();
-         err |= __put_user((u32)(u64)(tmp ? fpstate : NULL), &sc->fpstate);
+         err |= __put_user(ptr_to_compat(tmp ? fpstate : NULL), &sc->fpstate);
        }
 
        /* non-iBCS2 extensions.. */
@@ -461,7 +465,7 @@ void ia32_setup_frame(int sig, struct k_sigaction *ka,
                void __user *restorer = VSYSCALL32_SIGRETURN; 
                if (ka->sa.sa_flags & SA_RESTORER)
                        restorer = ka->sa.sa_restorer;       
-               err |= __put_user(ptr_to_u32(restorer), &frame->pretcode);
+               err |= __put_user(ptr_to_compat(restorer), &frame->pretcode);
        }
        /* These are actually not used anymore, but left because some 
           gdb versions depend on them as a marker. */
@@ -534,9 +538,9 @@ void ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                           : sig),
                          &frame->sig);
        }
-       err |= __put_user((u32)(u64)&frame->info, &frame->pinfo);
-       err |= __put_user((u32)(u64)&frame->uc, &frame->puc);
-       err |= ia32_copy_siginfo_to_user(&frame->info, info);
+       err |= __put_user(ptr_to_compat(&frame->info), &frame->pinfo);
+       err |= __put_user(ptr_to_compat(&frame->uc), &frame->puc);
+       err |= copy_siginfo_to_user32(&frame->info, info);
        if (err)
                goto give_sigsegv;
 
@@ -558,7 +562,7 @@ void ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                void __user *restorer = VSYSCALL32_RTSIGRETURN; 
                if (ka->sa.sa_flags & SA_RESTORER)
                        restorer = ka->sa.sa_restorer;       
-               err |= __put_user(ptr_to_u32(restorer), &frame->pretcode);
+               err |= __put_user(ptr_to_compat(restorer), &frame->pretcode);
        }
 
        /* This is movl $,%eax ; int $0x80 */