[patch-mm2] PI-futex: fix timeout race

The futex code has consequently the same timeout race as generic sleeper
based nanosleep. Call hrtimer_cancel() unconditionally.

Signed-off-by: Thomas Gleixner <[email protected]>

Index: linux-2.6.16-mm2/kernel/rtmutex.c
===================================================================
--- linux-2.6.16-mm2.orig/kernel/rtmutex.c
+++ linux-2.6.16-mm2/kernel/rtmutex.c
@@ -789,7 +789,7 @@ rt_mutex_slowlock(struct rt_mutex *lock,
 	spin_unlock_irqrestore(&lock->wait_lock, flags);
 
 	/* Remove pending timer: */
-	if (unlikely(timeout && timeout->task))
+	if (unlikely(timeout))
 		hrtimer_cancel(&timeout->timer);
 
 	/*


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• References:
  • [patch 05/10] PI-futex: rt-mutex core
    • From: Ingo Molnar <[email protected]>
  • Re: [patch 05/10] PI-futex: rt-mutex core
    • From: Andrew Morton <[email protected]>
  • [patch] PI-futex: -V2
    • From: Ingo Molnar <[email protected]>
  • [patch] PI-futex: -V3
    • From: Ingo Molnar <[email protected]>

• Prev by Date: Re: [PATCH 2.6.15] Adding kernel-level identd dispatcher
• Next by Date: [Patch:002/004]Unify pxm_to_node id ver.3. (for ia64)
• Previous by thread: [patch] PI-futex: -V3
• Next by thread: [patch] PI-futex patchset: -V4
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]