futex: fix futex_wait_setup key handling
PATCH v2 1/1 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.
Please apply to -rt and to tip:/core/futexes.
Reported-by Clark Williams <[email protected]>
Signed-off-by Darren Hart <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
---
kernel/futex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/futex.c +1 -1
@@ -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);
Commit-ID: a5a2a0c7fa039c59619bc908b3b1ed24734d442a Gitweb: http://git.kernel.org/tip/a5a2a0c7fa039c59619bc908b3b1ed24734d442a Author: Darren Hart <[email protected]> AuthorDate: Fri, 10 Apr 2009 09:50:05 -0700 Committer: Thomas Gleixner <[email protected]> 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 <[email protected]>
Signed-off-by Darren Hart <[email protected]>
LKML-Reference: <20090410165005.14342.16973.stgit@Aeon>
Signed-off-by Thomas Gleixner <[email protected]>
--- kernel/futex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/futex.c +1 -1
@@ -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);