Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
+6
-3
kernel/futex/core.c
+6
-3
kernel/futex/core.c
···
700
700
owner = uval & FUTEX_TID_MASK;
701
701
702
702
if (pending_op && !pi && !owner) {
703
-
futex_wake(uaddr, 1, 1, FUTEX_BITSET_MATCH_ANY);
703
+
futex_wake(uaddr, FLAGS_SIZE_32 | FLAGS_SHARED, 1,
704
+
FUTEX_BITSET_MATCH_ANY);
704
705
return 0;
705
706
}
706
707
···
753
752
* Wake robust non-PI futexes here. The wakeup of
754
753
* PI futexes happens in exit_pi_state():
755
754
*/
756
-
if (!pi && (uval & FUTEX_WAITERS))
757
-
futex_wake(uaddr, 1, 1, FUTEX_BITSET_MATCH_ANY);
755
+
if (!pi && (uval & FUTEX_WAITERS)) {
756
+
futex_wake(uaddr, FLAGS_SIZE_32 | FLAGS_SHARED, 1,
757
+
FUTEX_BITSET_MATCH_ANY);
758
+
}
758
759
759
760
return 0;
760
761
}