linux-mips
[Top] [All Lists]

Fix sys32_rt_sigtimedwait

To: linux-mips@linux-mips.org
Subject: Fix sys32_rt_sigtimedwait
From: Daniel Jacobowitz <dan@debian.org>
Date: Fri, 21 Jan 2005 00:41:11 -0500
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.5.1+cvs20040105i
The copy of this logic in arch/mips/ has gotten out of sync with the copy in
kernel/ - fatally so.  Because it doesn't set real_blocked, sigwaiting for a
blocked but otherwise fatal signal may cause the thread group to exit.

Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>

Index: linux/arch/mips/kernel/signal32.c
===================================================================
--- linux.orig/arch/mips/kernel/signal32.c      2005-01-20 18:43:07.056683648 
-0500
+++ linux/arch/mips/kernel/signal32.c   2005-01-21 00:34:37.213772391 -0500
@@ -948,25 +948,29 @@
        spin_lock_irq(&current->sighand->siglock);
        sig = dequeue_signal(current, &these, &info);
        if (!sig) {
-               /* None ready -- temporarily unblock those we're interested
-                  in so that we'll be awakened when they arrive.  */
-               sigset_t oldblocked = current->blocked;
-               sigandsets(&current->blocked, &current->blocked, &these);
-               recalc_sigpending();
-               spin_unlock_irq(&current->sighand->siglock);
-
                timeout = MAX_SCHEDULE_TIMEOUT;
                if (uts)
                        timeout = (timespec_to_jiffies(&ts)
                                   + (ts.tv_sec || ts.tv_nsec));
 
-               current->state = TASK_INTERRUPTIBLE;
-               timeout = schedule_timeout(timeout);
-
-               spin_lock_irq(&current->sighand->siglock);
-               sig = dequeue_signal(current, &these, &info);
-               current->blocked = oldblocked;
-               recalc_sigpending();
+               if (timeout) {
+                       /* None ready -- temporarily unblock those we're
+                        * interested while we are sleeping in so that we'll
+                        * be awakened when they arrive.  */
+                       current->real_blocked = current->blocked;
+                       sigandsets(&current->blocked, &current->blocked, 
&these);
+                       recalc_sigpending();
+                       spin_unlock_irq(&current->sighand->siglock);
+
+                       current->state = TASK_INTERRUPTIBLE;
+                       timeout = schedule_timeout(timeout);
+
+                       spin_lock_irq(&current->sighand->siglock);
+                       sig = dequeue_signal(current, &these, &info);
+                       current->blocked = current->real_blocked;
+                       siginitset(&current->real_blocked, 0);
+                       recalc_sigpending();
+               }
        }
        spin_unlock_irq(&current->sighand->siglock);
 

-- 
Daniel Jacobowitz

<Prev in Thread] Current Thread [Next in Thread>
  • Fix sys32_rt_sigtimedwait, Daniel Jacobowitz <=