From: tip-bot for Darren Hart <dvhart@linux.intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
dvhart@linux.intel.com, davej@redhat.com, tglx@linutronix.de,
dan.carpenter@oracle.com
Subject: [tip:core/urgent] futex: Test for pi_mutex on fault in futex_wait_requeue_pi()
Date: Tue, 24 Jul 2012 07:22:44 -0700 [thread overview]
Message-ID: <tip-b6070a8d9853eda010a549fa9a09eb8d7269b929@git.kernel.org> (raw)
In-Reply-To: <dc59890338fc413606f04e5c5b131530734dae3d.1342809673.git.dvhart@linux.intel.com>
Commit-ID: b6070a8d9853eda010a549fa9a09eb8d7269b929
Gitweb: http://git.kernel.org/tip/b6070a8d9853eda010a549fa9a09eb8d7269b929
Author: Darren Hart <dvhart@linux.intel.com>
AuthorDate: Fri, 20 Jul 2012 11:53:29 -0700
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 24 Jul 2012 16:02:56 +0200
futex: Test for pi_mutex on fault in futex_wait_requeue_pi()
If fixup_pi_state_owner() faults, pi_mutex may be NULL. Test
for pi_mutex != NULL before testing the owner against current
and possibly unlocking it.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/dc59890338fc413606f04e5c5b131530734dae3d.1342809673.git.dvhart@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/futex.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/futex.c b/kernel/futex.c
index e2b0fb9..05018bf 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2370,7 +2370,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
* fault, unlock the rt_mutex and return the fault to userspace.
*/
if (ret == -EFAULT) {
- if (rt_mutex_owner(pi_mutex) == current)
+ if (pi_mutex && rt_mutex_owner(pi_mutex) == current)
rt_mutex_unlock(pi_mutex);
} else if (ret == -EINTR) {
/*
next prev parent reply other threads:[~2012-07-24 14:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-20 18:46 [PATCH 0/3] futex: Fix issues found with trinity and static analysis Darren Hart
2012-07-20 18:46 ` [PATCH 1/3] futex: Test for pi_mutex on fault in futex_wait_requeue_pi Darren Hart
2012-07-24 14:22 ` tip-bot for Darren Hart [this message]
2012-07-20 18:46 ` [PATCH 2/3] futex: Fix bug in WARN_ON for NULL q.pi_state Darren Hart
2012-07-24 14:23 ` [tip:core/urgent] " tip-bot for Darren Hart
2012-07-20 18:46 ` [PATCH 3/3] futex: Forbid uaddr == uaddr2 in futex_wait_requeue_pi() Darren Hart
2012-07-24 14:24 ` [tip:core/urgent] " tip-bot for Darren Hart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-b6070a8d9853eda010a549fa9a09eb8d7269b929@git.kernel.org \
--to=dvhart@linux.intel.com \
--cc=dan.carpenter@oracle.com \
--cc=davej@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).