Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935381AbZDJQu1 (ORCPT ); Fri, 10 Apr 2009 12:50:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762149AbZDJQuP (ORCPT ); Fri, 10 Apr 2009 12:50:15 -0400 Received: from e32.co.us.ibm.com ([32.97.110.150]:40702 "EHLO e32.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760304AbZDJQuO (ORCPT ); Fri, 10 Apr 2009 12:50:14 -0400 From: Darren Hart Subject: [tip PATCH V2] futex: fix futex_wait_setup key handling To: linux-kernel@vger.kernel.org Cc: Darren Hart , Thomas Gleixner , Ingo Molnar Date: Fri, 10 Apr 2009 09:50:05 -0700 Message-ID: <20090410165005.14342.16973.stgit@Aeon> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1049 Lines: 34 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 Signed-off-by: Darren Hart Cc: Thomas Gleixner Cc: Ingo Molnar --- 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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/