vserver 2.0 rc7

[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 85534e5..fbd09b5 100644 (file)
--- a/arch/x86_64/ia32/ia32_signal.c
+++ b/arch/x86_64/ia32/ia32_signal.c
@@ -49,12 +49,12 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
                return -EFAULT;
 
        /* If you change siginfo_t structure, please make sure that
-                  this code is fixed accordingly.
-                  It should never copy any pad contained in the structure
-                  to avoid security leaks, but must copy the generic
-                  3 ints plus the relevant union member.  */
-               err = __put_user(from->si_signo, &to->si_signo);
-               err |= __put_user(from->si_errno, &to->si_errno);
+          this code is fixed accordingly.
+          It should never copy any pad contained in the structure
+          to avoid security leaks, but must copy the generic
+          3 ints plus the relevant union member.  */
+       err = __put_user(from->si_signo, &to->si_signo);
+       err |= __put_user(from->si_errno, &to->si_errno);
        err |= __put_user((short)from->si_code, &to->si_code);
 
        if (from->si_code < 0) {
@@ -72,6 +72,7 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
                        err |= __put_user(from->si_utime, &to->si_utime);
                        err |= __put_user(from->si_stime, &to->si_stime);
                        err |= __put_user(from->si_status, &to->si_status);
+                       /* FALL THROUGH */
                default:
                case __SI_KILL >> 16:
                        err |= __put_user(from->si_uid, &to->si_uid);
@@ -81,7 +82,8 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
                        break;
                case __SI_TIMER >> 16:
                        err |= __put_user(from->si_overrun, &to->si_overrun); 
-                       err |= __put_user(ptr_to_compat(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:
@@ -205,14 +207,14 @@ ia32_restore_sigcontext(struct pt_regs *regs, struct sigcontext_ia32 __user *sc,
                sc, sc->err, sc->eip, sc->cs, sc->eflags);
 #endif
 #define COPY(x)                { \
-       unsigned int reg;       \
+       unsigned int reg;                       \
        err |= __get_user(reg, &sc->e ##x);     \
        regs->r ## x = reg;                     \
 }
 
 #define RELOAD_SEG(seg,mask)                                           \
-       { unsigned int cur;                             \
-         unsigned short pre;                           \
+       { unsigned int cur;                                             \
+         unsigned short pre;                                           \
          err |= __get_user(pre, &sc->seg);                             \
          asm volatile("movl %%" #seg ",%0" : "=r" (cur));              \
          pre |= mask;                                                  \
@@ -256,7 +258,7 @@ ia32_restore_sigcontext(struct pt_regs *regs, struct sigcontext_ia32 __user *sc,
                err |= __get_user(tmp, &sc->fpstate);
                buf = compat_ptr(tmp);
                if (buf) {
-                       if (verify_area(VERIFY_READ, buf, sizeof(*buf)))
+                       if (!access_ok(VERIFY_READ, buf, sizeof(*buf)))
                                goto badframe;
                        err |= restore_i387_ia32(current, buf, 0);
                } else {
@@ -285,7 +287,7 @@ asmlinkage long sys32_sigreturn(struct pt_regs *regs)
        sigset_t set;
        unsigned int eax;
 
-       if (verify_area(VERIFY_READ, frame, sizeof(*frame)))
+       if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
                goto badframe;
        if (__get_user(set.sig[0], &frame->sc.oldmask)
            || (_COMPAT_NSIG_WORDS > 1
@@ -317,7 +319,7 @@ asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs)
 
        frame = (struct rt_sigframe __user *)(regs->rsp - 4);
 
-       if (verify_area(VERIFY_READ, frame, sizeof(*frame)))
+       if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
                goto badframe;
        if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
                goto badframe;
@@ -377,19 +379,19 @@ ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, struct _fpstate_ia32 __
        err |= __put_user(current->thread.error_code, &sc->err);
        err |= __put_user((u32)regs->rip, &sc->eip);
        eflags = regs->eflags;
-       if (current->ptrace & PT_PTRACED) {
+       if (current->ptrace & PT_PTRACED)
                eflags &= ~TF_MASK;
-       }
        err |= __put_user((u32)eflags, &sc->eflags);
        err |= __put_user((u32)regs->rsp, &sc->esp_at_signal);
 
        tmp = save_i387_ia32(current, fpstate, regs, 0);
        if (tmp < 0)
-         err = -EFAULT;
+               err = -EFAULT;
        else { 
                clear_used_math();
                stts();
-         err |= __put_user(ptr_to_compat(tmp ? fpstate : NULL), &sc->fpstate);
+               err |= __put_user(ptr_to_compat(tmp ? fpstate : NULL),
+                                       &sc->fpstate);
        }
 
        /* non-iBCS2 extensions.. */
@@ -439,7 +441,7 @@ void ia32_setup_frame(int sig, struct k_sigaction *ka,
 
        {
                struct exec_domain *ed = current_thread_info()->exec_domain;
-       err |= __put_user((ed
+               err |= __put_user((ed
                           && ed->signal_invmap
                           && sig < 32
                           ? ed->signal_invmap[sig]
@@ -449,7 +451,8 @@ void ia32_setup_frame(int sig, struct k_sigaction *ka,
        if (err)
                goto give_sigsegv;
 
-       err |= ia32_setup_sigcontext(&frame->sc, &frame->fpstate, regs, set->sig[0]);
+       err |= ia32_setup_sigcontext(&frame->sc, &frame->fpstate, regs,
+                                       set->sig[0]);
        if (err)
                goto give_sigsegv;
 
@@ -528,10 +531,9 @@ void ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                goto give_sigsegv;
 
-
        {
                struct exec_domain *ed = current_thread_info()->exec_domain;
-       err |= __put_user((ed
+               err |= __put_user((ed
                           && ed->signal_invmap
                           && sig < 32
                           ? ed->signal_invmap[sig]