]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
futex: Unlock hb->lock in futex_wait_requeue_pi() error path
authorThomas Gleixner <tglx@linutronix.de>
Thu, 11 Sep 2014 21:44:35 +0000 (23:44 +0200)
committerWilly Tarreau <w@1wt.eu>
Sun, 23 Nov 2014 09:55:53 +0000 (10:55 +0100)
commit5c114ceb1b1f75c960ddbdeadbb97ed57788db3f
tree640f715f53c822ebf99e097e7198164a40dc264c
parent673c64e0912b531f87db84d9c3d3f25737e91b5a
futex: Unlock hb->lock in futex_wait_requeue_pi() error path

futex_wait_requeue_pi() calls futex_wait_setup(). If
futex_wait_setup() succeeds it returns with hb->lock held and
preemption disabled. Now the sanity check after this does:

        if (match_futex(&q.key, &key2)) {
    ret = -EINVAL;
goto out_put_keys;
}

which releases the keys but does not release hb->lock.

So we happily return to user space with hb->lock held and therefor
preemption disabled.

Unlock hb->lock before taking the exit route.

Reported-by: Dave "Trinity" Jones <davej@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/alpine.DEB.2.10.1409112318500.4178@nanos
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
(cherry picked from commit 13c42c2f43b19aab3195f2d357db00d1e885eaa8)
[wt: 2.6.32 needs &q as first argument of queue_unlock()]
Signed-off-by: Willy Tarreau <w@1wt.eu>
kernel/futex.c