vserver 1.9.3

[linux-2.6.git] / arch / sparc / kernel / signal.c

diff --git a/arch/sparc/kernel/signal.c b/arch/sparc/kernel/signal.c
index 28edf93..276860d 100644 (file)
--- a/arch/sparc/kernel/signal.c
+++ b/arch/sparc/kernel/signal.c
@@ -274,7 +274,7 @@ static inline void do_new_sigreturn (struct pt_regs *regs)
        return;
 
 segv_and_exit:
-       do_exit(SIGSEGV);
+       force_sig(SIGSEGV, current);
 }
 
 asmlinkage void do_sigreturn(struct pt_regs *regs)
@@ -341,7 +341,7 @@ asmlinkage void do_sigreturn(struct pt_regs *regs)
        return;
 
 segv_and_exit:
-       send_sig(SIGSEGV, current, 1);
+       force_sig(SIGSEGV, current);
 }
 
 asmlinkage void do_rt_sigreturn(struct pt_regs *regs)
@@ -401,7 +401,7 @@ asmlinkage void do_rt_sigreturn(struct pt_regs *regs)
        spin_unlock_irq(&current->sighand->siglock);
        return;
 segv:
-       send_sig(SIGSEGV, current, 1);
+       force_sig(SIGSEGV, current);
 }
 
 /* Checks if the fp is valid */
@@ -549,7 +549,7 @@ setup_frame(struct sigaction *sa, struct pt_regs *regs, int signr, sigset_t *old
 sigill_and_return:
        do_exit(SIGILL);
 sigsegv:
-       do_exit(SIGSEGV);
+       force_sigsegv(signr, current);
 }
 
 
@@ -635,6 +635,7 @@ new_setup_frame(struct k_sigaction *ka, struct pt_regs *regs,
        regs->u_regs[UREG_FP] = (unsigned long) sf;
        regs->u_regs[UREG_I0] = signo;
        regs->u_regs[UREG_I1] = (unsigned long) &sf->info;
+       regs->u_regs[UREG_I2] = (unsigned long) &sf->info;
 
        /* 4. signal handler */
        regs->pc = (unsigned long) ka->sa.sa_handler;
@@ -662,7 +663,7 @@ new_setup_frame(struct k_sigaction *ka, struct pt_regs *regs,
 sigill_and_return:
        do_exit(SIGILL);
 sigsegv:
-       do_exit(SIGSEGV);
+       force_sigsegv(signo, current);
 }
 
 static inline void
@@ -719,6 +720,7 @@ new_setup_rt_frame(struct k_sigaction *ka, struct pt_regs *regs,
        regs->u_regs[UREG_FP] = (unsigned long) sf;
        regs->u_regs[UREG_I0] = signo;
        regs->u_regs[UREG_I1] = (unsigned long) &sf->info;
+       regs->u_regs[UREG_I2] = (unsigned long) &sf->regs;
 
        regs->pc = (unsigned long) ka->sa.sa_handler;
        regs->npc = (regs->pc + 4);
@@ -744,7 +746,7 @@ new_setup_rt_frame(struct k_sigaction *ka, struct pt_regs *regs,
 sigill:
        do_exit(SIGILL);
 sigsegv:
-       do_exit(SIGSEGV);
+       force_sigsegv(signo, current);
 }
 
 /* Setup a Solaris stack frame */
@@ -874,7 +876,7 @@ setup_svr4_frame(struct sigaction *sa, unsigned long pc, unsigned long npc,
 sigill_and_return:
        do_exit(SIGILL);
 sigsegv:
-       do_exit(SIGSEGV);
+       force_sigsegv(signr, current);
 }
 
 asmlinkage int svr4_getcontext(svr4_ucontext_t __user *uc, struct pt_regs *regs)
@@ -887,7 +889,7 @@ asmlinkage int svr4_getcontext(svr4_ucontext_t __user *uc, struct pt_regs *regs)
        synchronize_user_stack();
 
        if (current_thread_info()->w_saved)
-               goto sigsegv_and_return;
+               return -EFAULT;
 
        err = clear_user(uc, sizeof(*uc));
        if (err)
@@ -928,9 +930,6 @@ asmlinkage int svr4_getcontext(svr4_ucontext_t __user *uc, struct pt_regs *regs)
         * we have already stuffed all of it with sync_user_stack
         */
        return (err ? -EFAULT : 0);
-
-sigsegv_and_return:
-       do_exit(SIGSEGV);
 }
 
 /* Set the context for a svr4 application, this is Solaris way to sigreturn */
@@ -1016,7 +1015,7 @@ asmlinkage int svr4_setcontext(svr4_ucontext_t __user *c, struct pt_regs *regs)
        return (err ? -EFAULT : 0);
 
 sigsegv_and_return:
-       do_exit(SIGSEGV);
+       force_sig(SIGSEGV, current);
 }
 
 static inline void
@@ -1034,8 +1033,6 @@ handle_signal(unsigned long signr, struct k_sigaction *ka,
                else
                        setup_frame(&ka->sa, regs, signr, oldset, info);
        }
-       if (ka->sa.sa_flags & SA_ONESHOT)
-               ka->sa.sa_handler = SIG_DFL;
        if (!(ka->sa.sa_flags & SA_NOMASK)) {
                spin_lock_irq(&current->sighand->siglock);
                sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
@@ -1075,6 +1072,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs * regs,
 {
        siginfo_t info;
        struct sparc_deliver_cookie cookie;
+       struct k_sigaction ka;
        int signr;
 
        /*
@@ -1094,15 +1092,12 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs * regs,
        if (!oldset)
                oldset = &current->blocked;
 
-       signr = get_signal_to_deliver(&info, regs, &cookie);
+       signr = get_signal_to_deliver(&info, &ka, regs, &cookie);
        if (signr > 0) {
-               struct k_sigaction *ka;
-               
-               ka = &current->sighand->action[signr-1];
-
                if (cookie.restart_syscall)
-                       syscall_restart(cookie.orig_i0, regs, &ka->sa);
-               handle_signal(signr, ka, &info, oldset, regs, svr4_signal);
+                       syscall_restart(cookie.orig_i0, regs, &ka.sa);
+               handle_signal(signr, &ka, &info, oldset,
+                             regs, svr4_signal);
                return 1;
        }
        if (cookie.restart_syscall &&