Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3588a085 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

hrtimer: fix hrtimer_init_sleeper() users 



this patch:

 commit 37bb6cb4
 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: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 24e1c13c

kernel/futex.c

+2 −0
Original line number Diff line number Diff line
@@ -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

kernel/hrtimer.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

}