diff options
author | Oleg Nesterov <oleg@redhat.com> | 2011-05-25 13:22:27 -0400 |
---|---|---|
committer | Oleg Nesterov <oleg@redhat.com> | 2011-05-25 13:22:27 -0400 |
commit | d92fcf0552a15891b25c343cee340d295e24109c (patch) | |
tree | ad43a9c62d926f223d699544bcef4695af4f3e9d | |
parent | 0666fb51b1483f27506e212cc7f7b2645b5c7acc (diff) |
signal: sys_pause() should check signal_pending()
ERESTART* is always wrong without TIF_SIGPENDING. Teach sys_pause()
to handle the spurious wakeup correctly.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
-rw-r--r-- | kernel/signal.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index ad5e818baacc..86c32b884f8e 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -3023,8 +3023,10 @@ SYSCALL_DEFINE2(signal, int, sig, __sighandler_t, handler) | |||
3023 | 3023 | ||
3024 | SYSCALL_DEFINE0(pause) | 3024 | SYSCALL_DEFINE0(pause) |
3025 | { | 3025 | { |
3026 | current->state = TASK_INTERRUPTIBLE; | 3026 | while (!signal_pending(current)) { |
3027 | schedule(); | 3027 | current->state = TASK_INTERRUPTIBLE; |
3028 | schedule(); | ||
3029 | } | ||
3028 | return -ERESTARTNOHAND; | 3030 | return -ERESTARTNOHAND; |
3029 | } | 3031 | } |
3030 | 3032 | ||