Commit 97500641 authored Jan 19, 2021 by Thomas Gleixner Committed by Greg Kroah-Hartman Jan 29, 2021

UPSTREAM: futex: Replace pointless printk in fixup_owner()



commit 04b79c55201f02ffd675e1231d731365e335c307 upstream

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 04b79c55201f02ffd675e1231d731365e335c307)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I32bd64130d9414f65155ecd80646d01eb4374a60

parent 3a0f91fd

kernel/futex.c

+3 −7

Original line number	Diff line number	Diff line
		@@ -2687,14 +2687,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;
		}