[PATCH] signal handling race fixes: sparc and sparc64

Ok, here are the sparc64 and sparc32 versions.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/sparc/kernel/signal.c b/arch/sparc/kernel/signal.c
index 1673a24569f06df09f6029a663c2aa5b563af49d..3a16acba673cfac98fb56a52a5b5dad5a0507eb4 100644 (file)
--- a/arch/sparc/kernel/signal.c
+++ b/arch/sparc/kernel/signal.c
@@ -1036,8 +1036,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);
@@ -1077,6 +1075,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;
 
        /*
@@ -1096,15 +1095,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 &&

diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c
index 07f0fb37d59dbb8f77681f6b4e2adfff30f1da06..f280ddb903f6b1412634942fbc7d83d0b44476af 100644 (file)
--- a/arch/sparc64/kernel/signal.c
+++ b/arch/sparc64/kernel/signal.c
@@ -574,8 +574,6 @@ static inline void handle_signal(unsigned long signr, struct k_sigaction *ka,
 {
        setup_rt_frame(ka, regs, signr, oldset,
                       (ka->sa.sa_flags & SA_SIGINFO) ? info : NULL);
-       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);
@@ -615,6 +613,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs * regs,
 {
        siginfo_t info;
        struct signal_deliver_cookie cookie;
+       struct k_sigaction ka;
        int signr;
        
        cookie.restart_syscall = restart_syscall;
@@ -632,15 +631,11 @@ static int do_signal(sigset_t *oldset, struct pt_regs * regs,
        }
 #endif 
 
-       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(orig_i0, regs, &ka->sa);
-               handle_signal(signr, ka, &info, oldset, regs);
+                       syscall_restart(orig_i0, regs, &ka.sa);
+               handle_signal(signr, &ka, &info, oldset, regs);
                return 1;
        }
        if (cookie.restart_syscall &&

diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c
index 4476451b9d9dca9529afc021a28ee6fbea3752be..2bedb8cf26b359cb6f45e4977ecca1d7cb6367e2 100644 (file)
--- a/arch/sparc64/kernel/signal32.c
+++ b/arch/sparc64/kernel/signal32.c
@@ -1227,8 +1227,6 @@ static inline void handle_signal32(unsigned long signr, struct k_sigaction *ka,
                else
                        setup_frame32(&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);
@@ -1268,21 +1266,19 @@ int do_signal32(sigset_t *oldset, struct pt_regs * regs,
 {
        siginfo_t info;
        struct signal_deliver_cookie cookie;
+       struct k_sigaction ka;
        int signr;
        int svr4_signal = current->personality == PER_SVR4;
        
        cookie.restart_syscall = restart_syscall;
        cookie.orig_i0 = orig_i0;
 
-       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_restart32(orig_i0, regs, &ka->sa);
-               handle_signal32(signr, ka, &info, oldset, regs, svr4_signal);
+                       syscall_restart32(orig_i0, regs, &ka.sa);
+               handle_signal32(signr, &ka, &info, oldset,
+                               regs, svr4_signal);
                return 1;
        }
        if (cookie.restart_syscall &&