vserver 1.9.5.x5

[linux-2.6.git] / arch / sparc64 / kernel / signal32.c

diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c
index 63d9cec..4b060ca 100644 (file)
--- a/arch/sparc64/kernel/signal32.c
+++ b/arch/sparc64/kernel/signal32.c
@@ -20,9 +20,9 @@
 #include <linux/smp_lock.h>
 #include <linux/binfmts.h>
 #include <linux/compat.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/ptrace.h>
 #include <asm/svr4.h>
 #include <asm/pgtable.h>
@@ -86,7 +86,7 @@ struct new_signal_frame32 {
        __siginfo_fpu_t         fpu_state;
 };
 
-struct siginfo32 {
+typedef struct compat_siginfo{
        int si_signo;
        int si_errno;
        int si_code;
@@ -136,11 +136,11 @@ struct siginfo32 {
                        int _fd;
                } _sigpoll;
        } _sifields;
-};
+}compat_siginfo_t;
 
 struct rt_signal_frame32 {
        struct sparc_stackf32   ss;
-       struct siginfo32        info;
+       compat_siginfo_t        info;
        struct pt_regs32        regs;
        compat_sigset_t         mask;
        /* __siginfo_fpu32_t * */ u32 fpu_save;
@@ -157,11 +157,11 @@ struct rt_signal_frame32 {
 #define NF_ALIGNEDSZ  (((sizeof(struct new_signal_frame32) + 7) & (~7)))
 #define RT_ALIGNEDSZ  (((sizeof(struct rt_signal_frame32) + 7) & (~7)))
 
-int copy_siginfo_to_user32(struct siginfo32 __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(struct siginfo32)))
+       if (!access_ok(VERIFY_WRITE, to, sizeof(compat_siginfo_t)))
                return -EFAULT;
 
        /* If you change siginfo_t structure, please be sure
@@ -194,7 +194,7 @@ int copy_siginfo_to_user32(struct siginfo32 __user *to, siginfo_t *from)
                case __SI_FAULT >> 16:
                case __SI_POLL >> 16:
                        err |= __put_user(from->si_trapno, &to->si_trapno);
-                       err |= __put_user((long)from->si_addr, &to->si_addr);
+                       err |= __put_user((unsigned long)from->si_addr, &to->si_addr);
                        break;
                case __SI_RT >> 16: /* This is not generated by the kernel as of now.  */
                case __SI_MESGQ >> 16:
@@ -210,9 +210,9 @@ int copy_siginfo_to_user32(struct siginfo32 __user *to, siginfo_t *from)
 /* CAUTION: This is just a very minimalist implementation for the
  *          sake of compat_sys_rt_sigqueueinfo()
  */
-int copy_siginfo_to_kernel32(siginfo_t *to, struct siginfo32 __user *from)
+int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
 {
-       if (!access_ok(VERIFY_WRITE, from, sizeof(struct siginfo32)))
+       if (!access_ok(VERIFY_WRITE, from, sizeof(compat_siginfo_t)))
                return -EFAULT;
 
        if (copy_from_user(to, from, 3*sizeof(int)) ||
@@ -275,7 +275,7 @@ asmlinkage void do_rt_sigsuspend32(u32 uset, size_t sigsetsize, struct pt_regs *
                regs->u_regs[UREG_I0] = EINVAL;
                return;
        }
-       if (copy_from_user(&set32, (void __user *)(long)uset, sizeof(set32))) {
+       if (copy_from_user(&set32, compat_ptr(uset), sizeof(set32))) {
                regs->tstate |= TSTATE_ICARRY;
                regs->u_regs[UREG_I0] = EFAULT;
                return;
@@ -720,9 +720,9 @@ setup_frame32(struct sigaction *sa, struct pt_regs *regs, int signr, sigset_t *o
                        sig_address = NULL;
                }
        }
-       err |= __put_user((long)sig_address, &sframep->sig_address);
+       err |= __put_user(ptr_to_compat(sig_address), &sframep->sig_address);
        err |= __put_user(sig_code, &sframep->sig_code);
-       err |= __put_user((u64)sc, &sframep->sig_scptr);
+       err |= __put_user(ptr_to_compat(sc), &sframep->sig_scptr);
        if (err)
                goto sigsegv;
 
@@ -857,7 +857,8 @@ static void new_setup_frame32(struct k_sigaction *ka, struct pt_regs *regs,
                /* Flush instruction space. */
                unsigned long address = ((unsigned long)&(sf->insns[0]));
                pgd_t *pgdp = pgd_offset(current->mm, address);
-               pmd_t *pmdp = pmd_offset(pgdp, address);
+               pud_t *pudp = pud_offset(pgdp, address);
+               pmd_t *pmdp = pmd_offset(pudp, address);
                pte_t *ptep;
 
                regs->u_regs[UREG_I7] = (unsigned long) (&(sf->insns[0]) - 2);
@@ -967,7 +968,7 @@ setup_svr4_frame32(struct sigaction *sa, unsigned long pc, unsigned long npc,
        /* Save the currently window file: */
 
        /* 1. Link sfp->uc->gwins to our windows */
-       err |= __put_user((u32)(long)gw, &mc->gwin);
+       err |= __put_user(ptr_to_compat(gw), &mc->gwin);
            
        /* 2. Number of windows to restore at setcontext (): */
        err |= __put_user(get_thread_wsaved(), &gw->count);
@@ -1268,7 +1269,8 @@ static void setup_rt_frame32(struct k_sigaction *ka, struct pt_regs *regs,
                /* Flush instruction space. */
                unsigned long address = ((unsigned long)&(sf->insns[0]));
                pgd_t *pgdp = pgd_offset(current->mm, address);
-               pmd_t *pmdp = pmd_offset(pgdp, address);
+               pud_t *pudp = pud_offset(pgdp, address);
+               pmd_t *pmdp = pmd_offset(pudp, address);
                pte_t *ptep;
 
                regs->u_regs[UREG_I7] = (unsigned long) (&(sf->insns[0]) - 2);
@@ -1446,10 +1448,12 @@ asmlinkage long do_sys32_sigaltstack(u32 ussa, u32 uossa, unsigned long sp)
        u32 u_ss_sp = 0;
        int ret;
        mm_segment_t old_fs;
+       stack_t32 __user *uss32 = compat_ptr(ussa);
+       stack_t32 __user *uoss32 = compat_ptr(uossa);
        
-       if (ussa && (get_user(u_ss_sp, &((stack_t32 __user *)(long)ussa)->ss_sp) ||
-                   __get_user(uss.ss_flags, &((stack_t32 __user *)(long)ussa)->ss_flags) ||
-                   __get_user(uss.ss_size, &((stack_t32 __user *)(long)ussa)->ss_size)))
+       if (ussa && (get_user(u_ss_sp, &uss32->ss_sp) ||
+                   __get_user(uss.ss_flags, &uss32->ss_flags) ||
+                   __get_user(uss.ss_size, &uss32->ss_size)))
                return -EFAULT;
        uss.ss_sp = compat_ptr(u_ss_sp);
        old_fs = get_fs();
@@ -1457,9 +1461,9 @@ asmlinkage long do_sys32_sigaltstack(u32 ussa, u32 uossa, unsigned long sp)
        ret = do_sigaltstack(ussa ? (stack_t __user *) &uss : NULL,
                             uossa ? (stack_t __user *) &uoss : NULL, sp);
        set_fs(old_fs);
-       if (!ret && uossa && (put_user((long)uoss.ss_sp, &((stack_t32 __user *)(long)uossa)->ss_sp) ||
-                   __put_user(uoss.ss_flags, &((stack_t32 __user *)(long)uossa)->ss_flags) ||
-                   __put_user(uoss.ss_size, &((stack_t32 __user *)(long)uossa)->ss_size)))
+       if (!ret && uossa && (put_user(ptr_to_compat(uoss.ss_sp), &uoss32->ss_sp) ||
+                   __put_user(uoss.ss_flags, &uoss32->ss_flags) ||
+                   __put_user(uoss.ss_size, &uoss32->ss_size)))
                return -EFAULT;
        return ret;
 }