Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe49963 authored by Mateusz Nosek's avatar Mateusz Nosek Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: futex: Fix incorrect should_fail_futex() handling 



[ Upstream commit 921c7ebd1337d1a46783d7e15a850e12aed2eaa0 ]

If should_futex_fail() returns true in futex_wake_pi(), then the 'ret'
variable is set to -EFAULT and then immediately overwritten. So the failure
injection is non-functional.

Fix it by actually leaving the function and returning -EFAULT.

The Fixes tag is kinda blury because the initial commit which introduced
failure injection was already sloppy, but the below mentioned commit broke
it completely.

[ tglx: Massaged changelog ]

Fixes: 6b4f4bc9 ("locking/futex: Allow low-level atomic operations to return -EAGAIN")
Signed-off-by: default avatarMateusz Nosek <mateusznosek0@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20200927000858.24219-1-mateusznosek0@gmail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit 2db75903)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I22198b7a65630cb5649f3e889810783b147bfada
parent 52fd679f

kernel/futex.c

+3 −1
Original line number Diff line number Diff line
@@ -1595,8 +1595,10 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_pi_state *pi_ 
	 */

	newval = FUTEX_WAITERS | task_pid_vnr(new_owner);



	if (unlikely(should_fail_futex(true)))

	if (unlikely(should_fail_futex(true))) {

		ret = -EFAULT;

		goto out_unlock;

	}



	ret = cmpxchg_futex_value_locked(&curval, uaddr, uval, newval);

	if (!ret && (curval != uval)) {