vserver 1.9.3

[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 5716c8b..5fb7d17 100644 (file)
--- a/arch/x86_64/ia32/ia32_signal.c
+++ b/arch/x86_64/ia32/ia32_signal.c
@@ -115,7 +115,8 @@ int ia32_copy_siginfo_from_user(siginfo_t *to, siginfo_t32 __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,
+                struct pt_regs *regs)
 {
        sigset_t saveset;
 
@@ -126,11 +127,11 @@ sys32_sigsuspend(int history0, int history1, old_sigset_t mask, struct pt_regs r
        recalc_sigpending();
        spin_unlock_irq(&current->sighand->siglock);
 
-       regs.rax = -EINTR;
+       regs->rax = -EINTR;
        while (1) {
                current->state = TASK_INTERRUPTIBLE;
                schedule();
-               if (do_signal(&regs, &saveset))
+               if (do_signal(regs, &saveset))
                        return -EINTR;
        }
 }
@@ -138,7 +139,7 @@ sys32_sigsuspend(int history0, int history1, old_sigset_t mask, struct pt_regs r
 asmlinkage long
 sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
                  stack_ia32_t __user *uoss_ptr, 
-                 struct pt_regs regs)
+                 struct pt_regs *regs)
 {
        stack_t uss,uoss; 
        int ret;
@@ -155,7 +156,7 @@ sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
        }
        seg = get_fs(); 
        set_fs(KERNEL_DS); 
-       ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs.rsp);
+       ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->rsp);
        set_fs(seg); 
        if (ret >= 0 && uoss_ptr)  {
                if (!access_ok(VERIFY_WRITE,uoss_ptr,sizeof(stack_ia32_t)) ||
@@ -274,9 +275,9 @@ badframe:
        return 1;
 }
 
-asmlinkage long sys32_sigreturn(struct pt_regs regs)
+asmlinkage long sys32_sigreturn(struct pt_regs *regs)
 {
-       struct sigframe __user *frame = (struct sigframe __user *)(regs.rsp-8);
+       struct sigframe __user *frame = (struct sigframe __user *)(regs->rsp-8);
        sigset_t set;
        unsigned int eax;
 
@@ -294,20 +295,23 @@ asmlinkage long sys32_sigreturn(struct pt_regs regs)
        recalc_sigpending();
        spin_unlock_irq(&current->sighand->siglock);
        
-       if (ia32_restore_sigcontext(&regs, &frame->sc, &eax))
+       if (ia32_restore_sigcontext(regs, &frame->sc, &eax))
                goto badframe;
        return eax;
 
 badframe:
-       signal_fault(&regs, frame, "32bit sigreturn"); 
+       signal_fault(regs, frame, "32bit sigreturn");
        return 0;
 }      
 
-asmlinkage long sys32_rt_sigreturn(struct pt_regs regs)
+asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs)
 {
-       struct rt_sigframe __user *frame = (struct rt_sigframe __user *)(regs.rsp - 4);
+       struct rt_sigframe __user *frame;
        sigset_t set;
        unsigned int eax;
+       struct pt_regs tregs;
+
+       frame = (struct rt_sigframe __user *)(regs->rsp - 4);
 
        if (verify_area(VERIFY_READ, frame, sizeof(*frame)))
                goto badframe;
@@ -320,16 +324,17 @@ asmlinkage long sys32_rt_sigreturn(struct pt_regs regs)
        recalc_sigpending();
        spin_unlock_irq(&current->sighand->siglock);
        
-       if (ia32_restore_sigcontext(&regs, &frame->uc.uc_mcontext, &eax))
+       if (ia32_restore_sigcontext(regs, &frame->uc.uc_mcontext, &eax))
                goto badframe;
 
-       if (sys32_sigaltstack(&frame->uc.uc_stack, NULL, regs) == -EFAULT)
+       tregs = *regs;
+       if (sys32_sigaltstack(&frame->uc.uc_stack, NULL, &tregs) == -EFAULT)
                goto badframe;
 
        return eax;
 
 badframe:
-       signal_fault(&regs,frame,"32bit rt sigreturn");
+       signal_fault(regs,frame,"32bit rt sigreturn");
        return 0;
 }      
 
@@ -342,6 +347,7 @@ ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, struct _fpstate_ia32 __
                 struct pt_regs *regs, unsigned int mask)
 {
        int tmp, err = 0;
+       u32 eflags;
 
        tmp = 0;
        __asm__("movl %%gs,%0" : "=r"(tmp): "0"(tmp));
@@ -366,7 +372,11 @@ ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, struct _fpstate_ia32 __
        err |= __put_user(current->thread.trap_no, &sc->trapno);
        err |= __put_user(current->thread.error_code, &sc->err);
        err |= __put_user((u32)regs->rip, &sc->eip);
-       err |= __put_user((u32)regs->eflags, &sc->eflags);
+       eflags = regs->eflags;
+       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);
@@ -484,7 +494,13 @@ void ia32_setup_frame(int sig, struct k_sigaction *ka,
        regs->ss = __USER32_DS; 
 
        set_fs(USER_DS);
-       regs->eflags &= ~TF_MASK;
+       if (regs->eflags & TF_MASK) {
+               if (current->ptrace & PT_PTRACED) {
+                       ptrace_notify(SIGTRAP);
+               } else {
+                       regs->eflags &= ~TF_MASK;
+               }
+       }
 
 #if DEBUG_SIG
        printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",
@@ -494,9 +510,7 @@ void ia32_setup_frame(int sig, struct k_sigaction *ka,
        return;
 
 give_sigsegv:
-       if (sig == SIGSEGV)
-               ka->sa.sa_handler = SIG_DFL;
-       signal_fault(regs,frame,"32bit signal deliver");
+       force_sigsegv(sig, current);
 }
 
 void ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
@@ -580,7 +594,13 @@ void 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 (regs->eflags & TF_MASK) {
+               if (current->ptrace & PT_PTRACED) {
+                       ptrace_notify(SIGTRAP);
+               } else {
+                       regs->eflags &= ~TF_MASK;
+               }
+       }
 
 #if DEBUG_SIG
        printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",
@@ -590,8 +610,6 @@ void ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        return;
 
 give_sigsegv:
-       if (sig == SIGSEGV)
-               ka->sa.sa_handler = SIG_DFL;
-       signal_fault(regs, frame, "32bit rt signal setup"); 
+       force_sigsegv(sig, current);
 }