Messages in this thread Patch in this message | | | From | Darren Hart <> | Subject | [tip PATCH V2] futex: fix futex_wait_setup key handling | Date | Fri, 10 Apr 2009 09:50:05 -0700 |
| |
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.
Please apply to -rt and to tip:/core/futexes.
Reported-by: Clark Williams <williams@redhat.com> Signed-off-by: Darren Hart <dvhltc@us.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> ---
kernel/futex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/futex.c b/kernel/futex.c index 185c981..47520d2 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1645,7 +1645,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);
| |