linux-kernel - [tip:core/futexes] futex: fix futex_wait

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-a5a2a0c7fa039c59619bc908b3b1ed24734d442a@git.kernel.org>
Date:	Fri, 10 Apr 2009 20:06:36 GMT
From:	Darren Hart <dvhltc@...ibm.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, dvhltc@...ibm.com, hpa@...or.com,
	mingo@...hat.com, williams@...hat.com, tglx@...utronix.de
Subject: [tip:core/futexes] futex: fix futex_wait_setup key handling

Commit-ID:  a5a2a0c7fa039c59619bc908b3b1ed24734d442a
Gitweb:     http://git.kernel.org/tip/a5a2a0c7fa039c59619bc908b3b1ed24734d442a
Author:     Darren Hart <dvhltc@...ibm.com>
AuthorDate: Fri, 10 Apr 2009 09:50:05 -0700
Committer:  Thomas Gleixner <tglx@...utronix.de>
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@...hat.com>
Signed-off-by: Darren Hart <dvhltc@...ibm.com>
LKML-Reference: <20090410165005.14342.16973.stgit@...n>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>



---
 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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/