* [GIT pull] futex fix for 3.17
@ 2014-09-13 20:48 Thomas Gleixner
0 siblings, 0 replies; only message in thread
From: Thomas Gleixner @ 2014-09-13 20:48 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Andrew Morton, LKML, Ingo Molnar, H. Peter Anvin
Linus,
please pull the latest locking-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-for-linus
A oneliner bugfix for the jinxed futex code:
- Drop has bucket lock in the error exit path. I really could slap
myself for intruducing that bug while fixing all the other horror in
that code three month ago ...
Thanks,
tglx
------------------>
Thomas Gleixner (1):
futex: Unlock hb->lock in futex_wait_requeue_pi() error path
kernel/futex.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/futex.c b/kernel/futex.c
index d3a9d946d0b7..815d7af2ffe8 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2592,6 +2592,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
* shared futexes. We need to compare the keys:
*/
if (match_futex(&q.key, &key2)) {
+ queue_unlock(hb);
ret = -EINVAL;
goto out_put_keys;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-13 20:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-13 20:48 [GIT pull] futex fix for 3.17 Thomas Gleixner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®