diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2008-02-01 17:45:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-02-01 17:45:13 +0100 |
| commit | 3588a085cd52ef080bf72df772378e1ba6bb292f (patch) | |
| tree | 9c013c37431eb3a0d0da3ab14cbc4985600e82a2 | |
| parent | 24e1c13c93cbdd05e4b7ea921c0050b036555adc (diff) | |
hrtimer: fix hrtimer_init_sleeper() users
this patch:
commit 37bb6cb4097e29ffee970065b74499cbf10603a3
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri Jan 25 21:08:32 2008 +0100
hrtimer: unlock hrtimer_wakeup
Broke hrtimer_init_sleeper() users. It forgot to fix up the futex
caller of this function to detect the failed queueing and messed up
the do_nanosleep() caller in that it could leak a TASK_INTERRUPTIBLE
state.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | kernel/futex.c | 2 | ||||
| -rw-r--r-- | kernel/hrtimer.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index db9824de8bf..0edd314798c 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1252,6 +1252,8 @@ static int futex_wait(u32 __user *uaddr, struct rw_semaphore *fshared, t.timer.expires = *abs_time; hrtimer_start(&t.timer, t.timer.expires, HRTIMER_MODE_ABS); + if (!hrtimer_active(&t.timer)) + t.task = NULL; /* * the timer could have already expired, in which diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index bd5d6b5060b..1069998fe25 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1315,6 +1315,8 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod } while (t->task && !signal_pending(current)); + __set_current_state(TASK_RUNNING); + return t->task == NULL; } |