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

Commit ca453007 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ian Maund
Browse files

futex: Always cleanup owner tid in unlock_pi 



If the owner died bit is set at futex_unlock_pi, we currently do not
cleanup the user space futex. So the owner TID of the current owner
(the unlocker) persists. That's observable inconsistant state,
especially when the ownership of the pi state got transferred.

Clean it up unconditionally.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Kees Cook <keescook@chromium.org>
Cc: Will Drewry <wad@chromium.org>
Cc: Darren Hart <dvhart@linux.intel.com>
Cc: stable@vger.kernel.org
Git-commit: a2ec8e3dcdc6c93f574a0e22039b791cc5e14fa6
Git-repo: https://android.googlesource.com/kernel/common.git


Signed-off-by: default avatarIan Maund <imaund@codeaurora.org>
parent cb353c62

kernel/futex.c

+18 −22
Original line number Diff line number Diff line
@@ -888,6 +888,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) 
	struct task_struct *new_owner;

	struct futex_pi_state *pi_state = this->pi_state;

	u32 uninitialized_var(curval), newval;

	int ret = 0;



	if (!pi_state)

		return -EINVAL;
@@ -911,13 +912,10 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) 
		new_owner = this->task;



	/*

	 * We pass it to the next owner. (The WAITERS bit is always

	 * kept enabled while there is PI state around. We must also

	 * preserve the owner died bit.)

	 * We pass it to the next owner. The WAITERS bit is always

	 * kept enabled while there is PI state around. We cleanup the

	 * owner died bit, because we are the owner.

	 */

	if (!(uval & FUTEX_OWNER_DIED)) {

		int ret = 0;



	newval = FUTEX_WAITERS | task_pid_vnr(new_owner);



	if (cmpxchg_futex_value_locked(&curval, uaddr, uval, newval))
@@ -928,7 +926,6 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) 
		raw_spin_unlock(&pi_state->pi_mutex.wait_lock);

		return ret;

	}

	}



	raw_spin_lock_irq(&pi_state->owner->pi_lock);

	WARN_ON(list_empty(&pi_state->list));
@@ -2162,9 +2159,10 @@ retry: 
	/*

	 * To avoid races, try to do the TID -> 0 atomic transition

	 * again. If it succeeds then we can return without waking

	 * anyone else up:

	 * anyone else up. We only try this if neither the waiters nor

	 * the owner died bit are set.

	 */

	if (!(uval & FUTEX_OWNER_DIED) &&

	if (!(uval & ~FUTEX_TID_MASK) &&

	    cmpxchg_futex_value_locked(&uval, uaddr, vpid, 0))

		goto pi_faulted;

	/*
@@ -2196,11 +2194,9 @@ retry: 
	/*

	 * No waiters - kernel unlocks the futex:

	 */

	if (!(uval & FUTEX_OWNER_DIED)) {

	ret = unlock_futex_pi(uaddr, uval);

	if (ret == -EFAULT)

		goto pi_faulted;

	}



out_unlock:

	spin_unlock(&hb->lock);