summaryrefslogtreecommitdiffstats
path: root/kernel/futex.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2021-01-19 16:06:10 +0100
committerThomas Gleixner <tglx@linutronix.de>2021-01-26 15:10:58 +0100
commit04b79c55201f02ffd675e1231d731365e335c307 (patch)
tree470b54f9823fd454bfd6f29eb5ba1e39b5e4b939 /kernel/futex.c
parent12bb3f7f1b03d5913b3f9d4236a488aa7774dfe9 (diff)
downloadlinux-stable-04b79c55201f02ffd675e1231d731365e335c307.tar.gz
linux-stable-04b79c55201f02ffd675e1231d731365e335c307.tar.bz2
linux-stable-04b79c55201f02ffd675e1231d731365e335c307.zip
futex: Replace pointless printk in fixup_owner()
If that unexpected case of inconsistent arguments ever happens then the futex state is left completely inconsistent and the printk is not really helpful. Replace it with a warning and make the state consistent. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'kernel/futex.c')
-rw-r--r--kernel/futex.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index d5e61c2e865e..5dc8f893d523 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2550,14 +2550,10 @@ static int fixup_owner(u32 __user *uaddr, struct futex_q *q, int locked)
/*
* Paranoia check. If we did not take the lock, then we should not be
- * the owner of the rt_mutex.
+ * the owner of the rt_mutex. Warn and establish consistent state.
*/
- if (rt_mutex_owner(&q->pi_state->pi_mutex) == current) {
- printk(KERN_ERR "fixup_owner: ret = %d pi-mutex: %p "
- "pi-state %p\n", ret,
- q->pi_state->pi_mutex.owner,
- q->pi_state->owner);
- }
+ if (WARN_ON_ONCE(rt_mutex_owner(&q->pi_state->pi_mutex) == current))
+ return fixup_pi_state_owner(uaddr, q, current);
return 0;
}