Commit-ID: a5a2a0c7fa039c59619bc908b3b1ed24734d442a Gitweb: http://git.kernel.org/tip/a5a2a0c7fa039c59619bc908b3b1ed24734d442a Author: Darren Hart <dvhltc@xxxxxxxxxx> AuthorDate: Fri, 10 Apr 2009 09:50:05 -0700 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Fri, 10 Apr 2009 22:04:24 +0200 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@xxxxxxxxxx> Signed-off-by: Darren Hart <dvhltc@xxxxxxxxxx> LKML-Reference: <20090410165005.14342.16973.stgit@Aeon> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> --- kernel/futex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index 041bf3a..6d2daa4 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); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|