2006-10-01 11:38:36

by Esben Nielsen

[permalink] [raw]
Subject: [patch 5/5] Fix timeout bug in rtmutex in 2.6.18-rt

kernel/futex.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

Index: linux-2.6.18-rt/kernel/futex.c
===================================================================
--- linux-2.6.18-rt.orig/kernel/futex.c
+++ linux-2.6.18-rt/kernel/futex.c
@@ -567,6 +567,7 @@ static int wake_futex_pi(u32 __user *uad
if (!pi_state)
return -EINVAL;

+ spin_lock(&pi_state->pi_mutex.wait_lock);
new_owner = rt_mutex_next_owner(&pi_state->pi_mutex);

/*
@@ -589,10 +590,14 @@ static int wake_futex_pi(u32 __user *uad
inc_preempt_count();
curval = futex_atomic_cmpxchg_inatomic(uaddr, uval, newval);
dec_preempt_count();
- if (curval == -EFAULT)
+ if (curval == -EFAULT) {
+ spin_unlock(&pi_state->pi_mutex.wait_lock);
return -EFAULT;
- if (curval != uval)
+ }
+ if (curval != uval) {
+ spin_unlock(&pi_state->pi_mutex.wait_lock);
return -EINVAL;
+ }
}

spin_lock_irq(&pi_state->owner->pi_lock);
@@ -606,6 +611,8 @@ static int wake_futex_pi(u32 __user *uad
pi_state->owner = new_owner;
spin_unlock_irq(&new_owner->pi_lock);

+ spin_unlock(&pi_state->pi_mutex.wait_lock);
+
rt_mutex_unlock(&pi_state->pi_mutex);

return 0;

--