---

yaml --- r: 156729 b: refs/heads/master c: 392741e h: refs/heads/master i: 156727: ea2728f v: v3
git-mirror · Aug 10, 2009 · 9fa5ac7 · 9fa5ac7
1 parent a408e45
commit 9fa5ac7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dc88029fd916b860ef063c40180aa604ce93494
+refs/heads/master: 392741e0a4e17c82e3978b7fcbf04291294dc0a1
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
@@ -1256,8 +1256,15 @@ static int futex_requeue(u32 __user *uaddr1, int fshared, u32 __user *uaddr2,
 		if (!match_futex(&this->key, &key1))
 			continue;
 
-		WARN_ON(!requeue_pi && this->rt_waiter);
-		WARN_ON(requeue_pi && !this->rt_waiter);
+		/*
+		 * FUTEX_WAIT_REQEUE_PI and FUTEX_CMP_REQUEUE_PI should always
+		 * be paired with each other and no other futex ops.
+		 */
+		if ((requeue_pi && !this->rt_waiter) ||
+		    (!requeue_pi && this->rt_waiter)) {
+			ret = -EINVAL;
+			break;
+		}
 
 		/*
 		 * Wake nr_wake waiters.  For requeue_pi, if we acquired the