5 files changed, 72 insertions, 62 deletions

diff --git a/arch/x86_64/ia32/ia32_aout.c b/arch/x86_64/ia32/ia32_aout.c
index 3bf58af98936..396d3c100011 100644
--- a/arch/x86_64/ia32/ia32_aout.c
+++ b/arch/x86_64/ia32/ia32_aout.c
@@ -333,7 +333,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
                         return error;
                 }
 
-                error = bprm->file->f_op->read(bprm->file, (char *)text_addr,
+                error = bprm->file->f_op->read(bprm->file,
+                         (char __user *)text_addr,
                           ex.a_text+ex.a_data, &pos);
                 if ((signed long)error < 0) {
                         send_sig(SIGKILL, current, 0);
@@ -366,7 +367,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
                         down_write(&current->mm->mmap_sem);
                         do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
                         up_write(&current->mm->mmap_sem);
-                        bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
+                        bprm->file->f_op->read(bprm->file,
+                                        (char __user *)N_TXTADDR(ex),
                                         ex.a_text+ex.a_data, &pos);
                         flush_icache_range((unsigned long) N_TXTADDR(ex),
                                            (unsigned long) N_TXTADDR(ex) +
@@ -477,7 +479,7 @@ static int load_aout_library(struct file *file)
                 do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
                 up_write(&current->mm->mmap_sem);
                 
-                file->f_op->read(file, (char *)start_addr,
+                file->f_op->read(file, (char __user *)start_addr,
                         ex.a_text + ex.a_data, &pos);
                 flush_icache_range((unsigned long) start_addr,
                                    (unsigned long) start_addr + ex.a_text + ex.a_data);
diff --git a/arch/x86_64/ia32/ia32_signal.c b/arch/x86_64/ia32/ia32_signal.c
index 25e5ca22204c..a6ba9951e86c 100644
--- a/arch/x86_64/ia32/ia32_signal.c
+++ b/arch/x86_64/ia32/ia32_signal.c
@@ -113,25 +113,19 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
 }
 
 asmlinkage long
-sys32_sigsuspend(int history0, int history1, old_sigset_t mask,
-                 struct pt_regs *regs)
+sys32_sigsuspend(int history0, int history1, old_sigset_t mask)
 {
-        sigset_t saveset;
-
         mask &= _BLOCKABLE;
         spin_lock_irq(&current->sighand->siglock);
-        saveset = current->blocked;
+        current->saved_sigmask = current->blocked;
         siginitset(&current->blocked, mask);
         recalc_sigpending();
         spin_unlock_irq(&current->sighand->siglock);
 
-        regs->rax = -EINTR;
-        while (1) {
-                current->state = TASK_INTERRUPTIBLE;
-                schedule();
-                if (do_signal(regs, &saveset))
-                        return -EINTR;
-        }
+        current->state = TASK_INTERRUPTIBLE;
+        schedule();
+        set_thread_flag(TIF_RESTORE_SIGMASK);
+        return -ERESTARTNOHAND;
 }
 
 asmlinkage long
@@ -437,15 +431,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                 goto give_sigsegv;
 
-        {
-                struct exec_domain *ed = current_thread_info()->exec_domain;
-                err |= __put_user((ed
-                           && ed->signal_invmap
-                           && sig < 32
-                           ? ed->signal_invmap[sig]
-                           : sig),
-                          &frame->sig);
-        }
+        err |= __put_user(sig, &frame->sig);
         if (err)
                 goto give_sigsegv;
 
@@ -492,6 +478,11 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
         regs->rsp = (unsigned long) frame;
         regs->rip = (unsigned long) ka->sa.sa_handler;
 
+        /* Make -mregparm=3 work */
+        regs->rax = sig;
+        regs->rdx = 0;
+        regs->rcx = 0;
+
         asm volatile("movl %0,%%ds" :: "r" (__USER32_DS)); 
         asm volatile("movl %0,%%es" :: "r" (__USER32_DS)); 
 
@@ -499,20 +490,20 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
         regs->ss = __USER32_DS; 
 
         set_fs(USER_DS);
-    regs->eflags &= ~TF_MASK;
-    if (test_thread_flag(TIF_SINGLESTEP))
-        ptrace_notify(SIGTRAP);
+        regs->eflags &= ~TF_MASK;
+        if (test_thread_flag(TIF_SINGLESTEP))
+                ptrace_notify(SIGTRAP);
 
 #if DEBUG_SIG
         printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",
                 current->comm, current->pid, frame, regs->rip, frame->pretcode);
 #endif
 
-        return 1;
+        return 0;
 
 give_sigsegv:
         force_sigsegv(sig, current);
-        return 0;
+        return -EFAULT;
 }
 
 int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
@@ -595,18 +586,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->ss = __USER32_DS; 
 
         set_fs(USER_DS);
-    regs->eflags &= ~TF_MASK;
-    if (test_thread_flag(TIF_SINGLESTEP))
-        ptrace_notify(SIGTRAP);
+        regs->eflags &= ~TF_MASK;
+        if (test_thread_flag(TIF_SINGLESTEP))
+                ptrace_notify(SIGTRAP);
 
 #if DEBUG_SIG
         printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",
                 current->comm, current->pid, frame, regs->rip, frame->pretcode);
 #endif
 
-        return 1;
+        return 0;
 
 give_sigsegv:
         force_sigsegv(sig, current);
-        return 0;
+        return -EFAULT;
 }
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 5d4a7d125ed0..b4aa875e175b 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -71,6 +71,7 @@
  */     
 ENTRY(ia32_sysenter_target)
         CFI_STARTPROC32 simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA     rsp,0
         CFI_REGISTER    rsp,rbp
         swapgs
@@ -186,6 +187,7 @@ ENDPROC(ia32_sysenter_target)
  */     
 ENTRY(ia32_cstar_target)
         CFI_STARTPROC32 simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA     rsp,PDA_STACKOFFSET
         CFI_REGISTER    rip,rcx
         /*CFI_REGISTER  rflags,r11*/
@@ -293,6 +295,7 @@ ia32_badarg:
 
 ENTRY(ia32_syscall)
         CFI_STARTPROC   simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA     rsp,SS+8-RIP
         /*CFI_REL_OFFSET        ss,SS-RIP*/
         CFI_REL_OFFSET  rsp,RSP-RIP
@@ -370,6 +373,7 @@ ENTRY(ia32_ptregs_common)
         popq %r11
         CFI_ENDPROC
         CFI_STARTPROC32 simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA     rsp,SS+8-ARGOFFSET
         CFI_REL_OFFSET  rax,RAX-ARGOFFSET
         CFI_REL_OFFSET  rcx,RCX-ARGOFFSET
@@ -703,8 +707,8 @@ ia32_sys_call_table:
         .quad sys_readlinkat            /* 305 */
         .quad sys_fchmodat
         .quad sys_faccessat
-        .quad quiet_ni_syscall          /* pselect6 for now */
-        .quad quiet_ni_syscall          /* ppoll for now */
+        .quad compat_sys_pselect6
+        .quad compat_sys_ppoll
         .quad sys_unshare               /* 310 */
         .quad compat_sys_set_robust_list
         .quad compat_sys_get_robust_list
@@ -713,4 +717,5 @@ ia32_sys_call_table:
         .quad sys_tee
         .quad compat_sys_vmsplice
         .quad compat_sys_move_pages
+        .quad sys_getcpu
 ia32_syscall_end:               
diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86_64/ia32/ptrace32.c
index 659c0722f6b8..d18198ed636b 100644
--- a/arch/x86_64/ia32/ptrace32.c
+++ b/arch/x86_64/ia32/ptrace32.c
@@ -117,6 +117,10 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 val)
                         if ((0x5454 >> ((val >> (16 + 4*i)) & 0xf)) & 1)
                                return -EIO;
                 child->thread.debugreg7 = val; 
+                if (val)
+                        set_tsk_thread_flag(child, TIF_DEBUG);
+                else
+                        clear_tsk_thread_flag(child, TIF_DEBUG);
                 break; 
                     
         default:
@@ -371,8 +375,10 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)
                 ret = -EIO;
                 if (!access_ok(VERIFY_READ, u, sizeof(*u)))
                         break;
-                /* no checking to be bug-to-bug compatible with i386 */
-                __copy_from_user(&child->thread.i387.fxsave, u, sizeof(*u));
+                /* no checking to be bug-to-bug compatible with i386. */
+                /* but silence warning */
+                if (__copy_from_user(&child->thread.i387.fxsave, u, sizeof(*u)))
+                        ;
                 set_stopped_child_used_math(child);
                 child->thread.i387.fxsave.mxcsr &= mxcsr_feature_mask;
                 ret = 0; 
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index 9c130993380d..f280d3665f4b 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -60,6 +60,7 @@
 #include <linux/highuid.h>
 #include <linux/vmalloc.h>
 #include <linux/fsnotify.h>
+#include <linux/sysctl.h>
 #include <asm/mman.h>
 #include <asm/types.h>
 #include <asm/uaccess.h>
@@ -389,7 +390,9 @@ sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
                 }
         }
         set_fs (KERNEL_DS);
-        ret = sys_rt_sigprocmask(how, set ? &s : NULL, oset ? &s : NULL,
+        ret = sys_rt_sigprocmask(how,
+                                 set ? (sigset_t __user *)&s : NULL,
+                                 oset ? (sigset_t __user *)&s : NULL,
                                  sigsetsize); 
         set_fs (old_fs);
         if (ret) return ret;
@@ -541,7 +544,7 @@ sys32_sysinfo(struct sysinfo32 __user *info)
         int bitcount = 0;
         
         set_fs (KERNEL_DS);
-        ret = sys_sysinfo(&s);
+        ret = sys_sysinfo((struct sysinfo __user *)&s);
         set_fs (old_fs);
 
         /* Check to see if any memory value is too large for 32-bit and scale
@@ -589,7 +592,7 @@ sys32_sched_rr_get_interval(compat_pid_t pid, struct compat_timespec __user *int
         mm_segment_t old_fs = get_fs ();
         
         set_fs (KERNEL_DS);
-        ret = sys_sched_rr_get_interval(pid, &t);
+        ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
         set_fs (old_fs);
         if (put_compat_timespec(&t, interval))
                 return -EFAULT;
@@ -605,7 +608,7 @@ sys32_rt_sigpending(compat_sigset_t __user *set, compat_size_t sigsetsize)
         mm_segment_t old_fs = get_fs();
                 
         set_fs (KERNEL_DS);
-        ret = sys_rt_sigpending(&s, sigsetsize);
+        ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
         set_fs (old_fs);
         if (!ret) {
                 switch (_NSIG_WORDS) {
@@ -630,7 +633,7 @@ sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *uinfo)
         if (copy_siginfo_from_user32(&info, uinfo))
                 return -EFAULT;
         set_fs (KERNEL_DS);
-        ret = sys_rt_sigqueueinfo(pid, sig, &info);
+        ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
         set_fs (old_fs);
         return ret;
 }
@@ -645,7 +648,7 @@ sys32_pause(void)
 }
 
 
-#ifdef CONFIG_SYSCTL
+#ifdef CONFIG_SYSCTL_SYSCALL
 struct sysctl_ia32 {
         unsigned int    name;
         int             nlen;
@@ -666,9 +669,6 @@ sys32_sysctl(struct sysctl_ia32 __user *args32)
         size_t oldlen;
         int __user *namep;
         long ret;
-        extern int do_sysctl(int *name, int nlen, void *oldval, size_t *oldlenp,
-                     void *newval, size_t newlen);
-
 
         if (copy_from_user(&a32, args32, sizeof (a32)))
                 return -EFAULT;
@@ -692,7 +692,8 @@ sys32_sysctl(struct sysctl_ia32 __user *args32)
 
         set_fs(KERNEL_DS);
         lock_kernel();
-        ret = do_sysctl(namep, a32.nlen, oldvalp, &oldlen, newvalp, (size_t) a32.newlen);
+        ret = do_sysctl(namep, a32.nlen, oldvalp, (size_t __user *)&oldlen,
+                        newvalp, (size_t) a32.newlen);
         unlock_kernel();
         set_fs(old_fs);
 
@@ -743,7 +744,8 @@ sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, s32 count)
                 return -EFAULT;
                 
         set_fs(KERNEL_DS);
-        ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count);
+        ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
+                           count);
         set_fs(old_fs);
         
         if (offset && put_user(of, offset))
@@ -778,7 +780,7 @@ asmlinkage long sys32_mmap2(unsigned long addr, unsigned long len,
 
 asmlinkage long sys32_olduname(struct oldold_utsname __user * name)
 {
-        int error;
+        int err;
 
         if (!name)
                 return -EFAULT;
@@ -787,27 +789,31 @@ asmlinkage long sys32_olduname(struct oldold_utsname __user * name)
   
         down_read(&uts_sem);
         
-        error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
-         __put_user(0,name->sysname+__OLD_UTS_LEN);
-         __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
-         __put_user(0,name->nodename+__OLD_UTS_LEN);
-         __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
-         __put_user(0,name->release+__OLD_UTS_LEN);
-         __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
-         __put_user(0,name->version+__OLD_UTS_LEN);
+        err = __copy_to_user(&name->sysname,&system_utsname.sysname,
+                                __OLD_UTS_LEN);
+        err |= __put_user(0,name->sysname+__OLD_UTS_LEN);
+        err |= __copy_to_user(&name->nodename,&system_utsname.nodename,
+                                __OLD_UTS_LEN);
+        err |= __put_user(0,name->nodename+__OLD_UTS_LEN);
+        err |= __copy_to_user(&name->release,&system_utsname.release,
+                                __OLD_UTS_LEN);
+        err |= __put_user(0,name->release+__OLD_UTS_LEN);
+        err |= __copy_to_user(&name->version,&system_utsname.version,
+                                __OLD_UTS_LEN);
+        err |= __put_user(0,name->version+__OLD_UTS_LEN);
          { 
                  char *arch = "x86_64";
                  if (personality(current->personality) == PER_LINUX32)
                          arch = "i686";
                  
-                 __copy_to_user(&name->machine,arch,strlen(arch)+1);
+                 err |= __copy_to_user(&name->machine,arch,strlen(arch)+1);
          }
         
          up_read(&uts_sem);
          
-         error = error ? -EFAULT : 0;
+         err = err ? -EFAULT : 0;
          
-         return error;
+         return err;
 }
 
 long sys32_uname(struct old_utsname __user * name)
@@ -831,7 +837,7 @@ long sys32_ustat(unsigned dev, struct ustat32 __user *u32p)
         
         seg = get_fs(); 
         set_fs(KERNEL_DS); 
-        ret = sys_ustat(dev,&u); 
+        ret = sys_ustat(dev, (struct ustat __user *)&u);
         set_fs(seg);
         if (ret >= 0) { 
                 if (!access_ok(VERIFY_WRITE,u32p,sizeof(struct ustat32)) ||