---

yaml --- r: 137598 b: refs/heads/master c: e8f6386 h: refs/heads/master v: v3
git-mirror · Mar 12, 2009 · e502a80 · e502a80
1 parent 576c3cd
commit e502a80
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16f4993f4e9860715918efd4eeac928f8de1218b
+refs/heads/master: e8f6386c01a5699c115bdad10271a24076364c97
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
@@ -1567,6 +1567,13 @@ static int futex_lock_pi(u32 __user *uaddr, int fshared,
 		}
 	}
 
+	/*
+	 * If fixup_pi_state_owner() faulted and was unable to handle the
+	 * fault, unlock it and return the fault to userspace.
+	 */
+	if (ret && (rt_mutex_owner(&q.pi_state->pi_mutex) == current))
+		rt_mutex_unlock(&q.pi_state->pi_mutex);
+
 	/* Unqueue and drop the lock */
 	unqueue_me_pi(&q);