mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
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
This commit is contained in:
parent
12bb3f7f1b
commit
04b79c5520
1 changed files with 3 additions and 7 deletions
|
@ -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
|
* 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) {
|
if (WARN_ON_ONCE(rt_mutex_owner(&q->pi_state->pi_mutex) == current))
|
||||||
printk(KERN_ERR "fixup_owner: ret = %d pi-mutex: %p "
|
return fixup_pi_state_owner(uaddr, q, current);
|
||||||
"pi-state %p\n", ret,
|
|
||||||
q->pi_state->pi_mutex.owner,
|
|
||||||
q->pi_state->owner);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue