Commit 2f84f823 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locking_urgent_for_v6.7_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking fix from Borislav Petkov:

 - Fix a hardcoded futex flags case which lead to one robust futex test
   failure

* tag 'locking_urgent_for_v6.7_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: Fix hardcoded flags
parents c8b3443c c9bd1568

kernel/futex/core.c

+6 −3
Original line number Diff line number Diff line
@@ -700,7 +700,8 @@ static int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, 
	owner = uval & FUTEX_TID_MASK;



	if (pending_op && !pi && !owner) {

		futex_wake(uaddr, 1, 1, FUTEX_BITSET_MATCH_ANY);

		futex_wake(uaddr, FLAGS_SIZE_32 | FLAGS_SHARED, 1,

			   FUTEX_BITSET_MATCH_ANY);

		return 0;

	}
@@ -752,8 +753,10 @@ static int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, 
	 * Wake robust non-PI futexes here. The wakeup of

	 * PI futexes happens in exit_pi_state():

	 */

	if (!pi && (uval & FUTEX_WAITERS))

		futex_wake(uaddr, 1, 1, FUTEX_BITSET_MATCH_ANY);

	if (!pi && (uval & FUTEX_WAITERS)) {

		futex_wake(uaddr, FLAGS_SIZE_32 | FLAGS_SHARED, 1,

			   FUTEX_BITSET_MATCH_ANY);

	}



	return 0;

}