From 5920a4a624b1f4db310d1c44997b640e2a4653e5 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Sat, 29 Jul 2017 00:02:03 -0400 Subject: mutex: Fix robust mutex lock acquire (Bug 21778) 65810f0ef05e8c9e333f17a44e77808b163ca298 fixed a robust mutex bug but introduced BZ 21778: if the CAS used to try to acquire a lock fails, the expected value is not updated, which breaks other cases in the loce acquisition loop. The fix is to simply update the expected value with the value returned by the CAS, which ensures that behavior is as if the first case with the CAS never happened (if the CAS fails). This is a regression introduced in the last release. Tested on x86_64, i686, ppc64, ppc64le, s390x, aarch64, armv7hl. --- ChangeLog | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 4cec993f99..5368e15fb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,17 @@ -2017-07-23 Nathan Rossi +2017-07-29 Torvald Riegel + Carlos O'Donell + + [BZ 21778] + * nptl/pthread_mutex_timedlock.c (__pthread_mutex_timedlock): Update + oldval if the CAS fails. + * nptl/pthread_mutex_lock.c (__pthread_mutex_lock_full): Likewise. + * nptl/tst-mutex7.c: Add comments explaining template test. + (ROBUST, DELAY_NSEC, ROUNDS, N): New. + (tf, do_test): Use them. + * nptl/tst-mutex7robust.c: New file. + * nptl/Makefile (tests): Add new test. + +2017-07-28 Nathan Rossi [BZ #21779] * sysdeps/unix/sysv/linux/microblaze/pt-vfork.S: Branch using PLT. -- cgit 1.4.1