Commit 04b79c55 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
parent 12bb3f7f

kernel/futex.c

+3 −7
Original line number Diff line number Diff line
@@ -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;

}