aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/futex.c
diff options
context:
space:
mode:
authorDarren Hart <dvhltc@us.ibm.com>2009-04-10 12:50:05 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-04-10 16:04:24 -0400
commita5a2a0c7fa039c59619bc908b3b1ed24734d442a (patch)
tree893dd52f07866834e84e63cb940e1dae1623e259 /kernel/futex.c
parentd2de688891909b148efe83a6fc9520a9cd6015f0 (diff)
futex: fix futex_wait_setup key handling
If the get_futex_key() call were to fail, the existing code would try and put_futex_key() prior to returning. This patch makes sure we only put_futex_key() if get_futex_key() succeeded. Reported-by: Clark Williams <williams@redhat.com> Signed-off-by: Darren Hart <dvhltc@us.ibm.com> LKML-Reference: <20090410165005.14342.16973.stgit@Aeon> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/futex.c')
-rw-r--r--kernel/futex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 041bf3ac4be..6d2daa46f9f 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1668,7 +1668,7 @@ retry:
1668 q->key = FUTEX_KEY_INIT; 1668 q->key = FUTEX_KEY_INIT;
1669 ret = get_futex_key(uaddr, fshared, &q->key); 1669 ret = get_futex_key(uaddr, fshared, &q->key);
1670 if (unlikely(ret != 0)) 1670 if (unlikely(ret != 0))
1671 goto out; 1671 return ret;
1672 1672
1673retry_private: 1673retry_private:
1674 *hb = queue_lock(q); 1674 *hb = queue_lock(q);