diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-02-03 13:45:34 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-10 09:09:23 +0100 |
| commit | 083895e36422882ac5bb393337b6f7cb1a5f046d (patch) | |
| tree | 834e04f058c575cc47d4843de4d8e5edca4a0b06 | |
| parent | 781691c797deefe41090e9f0c02e8fcb9fca4ccf (diff) | |
| download | linux-083895e36422882ac5bb393337b6f7cb1a5f046d.tar.gz linux-083895e36422882ac5bb393337b6f7cb1a5f046d.tar.bz2 linux-083895e36422882ac5bb393337b6f7cb1a5f046d.zip | |
futex: Replace pointless printk in fixup_owner()
[ Upstream commit 04b79c55201f02ffd675e1231d731365e335c307 ]
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
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | kernel/futex.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 8b137505fb50..e44203956d54 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2447,14 +2447,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); out: return ret ? ret : locked; |