Messages in this thread Patch in this message | | | Date | Sat, 13 Sep 2014 22:48:27 +0200 (CEST) | From | Thomas Gleixner <> | Subject | [GIT pull] futex fix for 3.17 |
| |
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; }
| |