From: "tip-bot2 for Colin Ian King" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Colin Ian King <colin.king@canonical.com>,
Thomas Gleixner <tglx@linutronix.de>,
andrealmeid@collabora.com, x86@kernel.org,
linux-kernel@vger.kernel.org
Subject: [tip: locking/urgent] futex: Return error code instead of assigning it without effect
Date: Wed, 01 Sep 2021 19:28:35 -0000 [thread overview]
Message-ID: <163052451566.25758.7272209152781403112.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210818131840.34262-1-colin.king@canonical.com>
The following commit has been merged into the locking/urgent branch of tip:
Commit-ID: 1f15eb89144fdd4c881ef7181d51e989a732f4f0
Gitweb: https://git.kernel.org/tip/1f15eb89144fdd4c881ef7181d51e989a732f4f0
Author: Colin Ian King <colin.king@canonical.com>
AuthorDate: Wed, 18 Aug 2021 14:18:40 +01:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 01 Sep 2021 21:26:33 +02:00
futex: Return error code instead of assigning it without effect
The check on the rt_waiter and top_waiter->pi_state is assigning an error
return code to ret but this later gets re-assigned, hence the check is
ineffective.
Return -EINVAL rather than assigning it to ret which was the original
intent.
Fixes: dc7109aaa233 ("futex: Validate waiter correctly in futex_proxy_trylock_atomic()")
Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: André Almeida <andrealmeid@collabora.com>
Link: https://lore.kernel.org/r/20210818131840.34262-1-colin.king@canonical.com
---
kernel/futex.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/futex.c b/kernel/futex.c
index e7b4c61..30e7dae 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2025,7 +2025,7 @@ futex_proxy_trylock_atomic(u32 __user *pifutex, struct futex_hash_bucket *hb1,
* and waiting on the 'waitqueue' futex which is always !PI.
*/
if (!top_waiter->rt_waiter || top_waiter->pi_state)
- ret = -EINVAL;
+ return -EINVAL;
/* Ensure we requeue to the expected futex. */
if (!match_futex(top_waiter->requeue_pi_key, key2))
next prev parent reply other threads:[~2021-09-01 19:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-18 13:18 [PATCH][next] futex: fix assigned ret variable that is never read Colin King
2021-09-01 18:26 ` André Almeida
2021-09-01 19:28 ` tip-bot2 for Colin Ian King [this message]
2021-09-01 20:24 ` Davidlohr Bueso
2021-09-02 20:14 ` [tip: locking/urgent] futex: Return error code instead of assigning it without effect tip-bot2 for Colin Ian King
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=163052451566.25758.7272209152781403112.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=andrealmeid@collabora.com \
--cc=colin.king@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.