diff options
| author | Darren Hart <dvhltc@us.ibm.com> | 2009-04-10 09:50:05 -0700 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-04-10 22:04:24 +0200 |
| commit | a5a2a0c7fa039c59619bc908b3b1ed24734d442a (patch) | |
| tree | 893dd52f07866834e84e63cb940e1dae1623e259 | |
| parent | d2de688891909b148efe83a6fc9520a9cd6015f0 (diff) | |
| download | linux-3.10-a5a2a0c7fa039c59619bc908b3b1ed24734d442a.tar.gz linux-3.10-a5a2a0c7fa039c59619bc908b3b1ed24734d442a.tar.bz2 linux-3.10-a5a2a0c7fa039c59619bc908b3b1ed24734d442a.zip | |
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>
| -rw-r--r-- | kernel/futex.c | 2 |
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: q->key = FUTEX_KEY_INIT; ret = get_futex_key(uaddr, fshared, &q->key); if (unlikely(ret != 0)) - goto out; + return ret; retry_private: *hb = queue_lock(q); |