Commit a974b540 authored by Colin Ian King's avatar Colin Ian King Committed by Thomas Gleixner
Browse files

futex: Return error code instead of assigning it without effect 



The check on the rt_waiter and top_waiter->pi_state is assigning an error
return code to ret but this later gets re-assigned, hence the check is
ineffective.

Return -EINVAL rather than assigning it to ret which was the original
intent.

Fixes: dc7109aa ("futex: Validate waiter correctly in futex_proxy_trylock_atomic()")
Addresses-Coverity: ("Unused value")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarAndré Almeida <andrealmeid@collabora.com>
Link: https://lore.kernel.org/r/20210818131840.34262-1-colin.king@canonical.com
parent 15eb7c88

kernel/futex.c

+1 −1
Original line number Diff line number Diff line
@@ -2025,7 +2025,7 @@ futex_proxy_trylock_atomic(u32 __user *pifutex, struct futex_hash_bucket *hb1, 
	 * and waiting on the 'waitqueue' futex which is always !PI.

	 */

	if (!top_waiter->rt_waiter || top_waiter->pi_state)

		ret = -EINVAL;

		return -EINVAL;



	/* Ensure we requeue to the expected futex. */

	if (!match_futex(top_waiter->requeue_pi_key, key2))