Andreas Schwab
5005d4836d
- tls-dtor-list-mangling.patch: Harden tls_dtor_list with pointer mangling (BZ #19018) - prelink-elf-rtype-class.patch: Keep only ELF_RTYPE_CLASS_{PLT|COPY} bits for prelink (BZ #19178) - vector-finite-math-aliases.patch: Better workaround for aliases of *_finite symbols in vector math library (BZ# 19058) - powerpc-elision-adapt-param.patch: powerpc: Fix usage of elision transient failure adapt param (BZ #19174) - catopen-unbound-alloca.patch: Fix unbound alloca in catopen (CVE-2015-8779, bsc#962739, BZ #17905) - strftime-range-check.patch: Add range check on time fields (CVE-2015-8776, bsc#962736, BZ #18985) - hcreate-overflow-check.patch: Handle overflow in hcreate (CVE-2015-8778, bsc#962737, BZ #18240) - errorcheck-mutex-no-elision.patch: Don't do lock elision on an error checking mutex (bsc#956716, BZ #17514) - refactor-nan-parsing.patch: Refactor strtod parsing of NaN payloads (CVE-2014-9761, bsc#962738, BZ #16962) - send-dg-buffer-overflow.patch: Fix getaddrinfo stack-based buffer overflow (CVE-2015-7547, bsc#961721, BZ #18665) - powerpc-lock-elision-race.patch: renamed from 0001-powerpc-Fix-a-race-condition-when-eliding-a-lock-20150730.patch OBS-URL: https://build.opensuse.org/request/show/359989 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=421
103 lines
3.4 KiB
Diff
103 lines
3.4 KiB
Diff
2016-01-25 Andreas Schwab <schwab@suse.de>
|
|
|
|
[BZ #17514]
|
|
* nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock)
|
|
<case PTHREAD_MUTEX_ERRORCHECK_NP>: Don't do lock elision.
|
|
* nptl/Makefile (tests): Add tst-mutex-errorcheck.
|
|
* nptl/tst-mutex-errorcheck.c: New file.
|
|
|
|
Index: glibc-2.22/nptl/Makefile
|
|
===================================================================
|
|
--- glibc-2.22.orig/nptl/Makefile
|
|
+++ glibc-2.22/nptl/Makefile
|
|
@@ -283,7 +283,8 @@ tests = tst-typesizes \
|
|
tst-getpid3 \
|
|
tst-setuid3 \
|
|
tst-initializers1 $(addprefix tst-initializers1-,c89 gnu89 c99 gnu99) \
|
|
- tst-bad-schedattr
|
|
+ tst-bad-schedattr \
|
|
+ tst-thread_local1 tst-mutex-errorcheck
|
|
xtests = tst-setuid1 tst-setuid1-static tst-setuid2 \
|
|
tst-mutexpp1 tst-mutexpp6 tst-mutexpp10
|
|
test-srcs = tst-oddstacklimit
|
|
Index: glibc-2.22/nptl/pthread_mutex_timedlock.c
|
|
===================================================================
|
|
--- glibc-2.22.orig/nptl/pthread_mutex_timedlock.c
|
|
+++ glibc-2.22/nptl/pthread_mutex_timedlock.c
|
|
@@ -90,7 +90,8 @@ pthread_mutex_timedlock (mutex, abstime)
|
|
if (__glibc_unlikely (mutex->__data.__owner == id))
|
|
return EDEADLK;
|
|
|
|
- /* FALLTHROUGH */
|
|
+ /* Don't do lock elision on an error checking mutex. */
|
|
+ goto simple;
|
|
|
|
case PTHREAD_MUTEX_TIMED_NP:
|
|
FORCE_ELISION (mutex, goto elision);
|
|
Index: glibc-2.22/nptl/tst-mutex-errorcheck.c
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.22/nptl/tst-mutex-errorcheck.c
|
|
@@ -0,0 +1,61 @@
|
|
+/* Check that error checking mutexes are not subject to lock elision.
|
|
+ Copyright (C) 2016 Free Software Foundation, Inc.
|
|
+ This file is part of the GNU C Library.
|
|
+
|
|
+ The GNU C Library is free software; you can redistribute it and/or
|
|
+ modify it under the terms of the GNU Lesser General Public
|
|
+ License as published by the Free Software Foundation; either
|
|
+ version 2.1 of the License, or (at your option) any later version.
|
|
+
|
|
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
+ Lesser General Public License for more details.
|
|
+
|
|
+ You should have received a copy of the GNU Lesser General Public
|
|
+ License along with the GNU C Library; if not, see
|
|
+ <http://www.gnu.org/licenses/>. */
|
|
+
|
|
+#include <stdio.h>
|
|
+#include <errno.h>
|
|
+#include <time.h>
|
|
+#include <pthread.h>
|
|
+
|
|
+static int
|
|
+do_test (void)
|
|
+{
|
|
+ struct timespec tms = { 0 };
|
|
+ pthread_mutex_t mutex;
|
|
+ pthread_mutexattr_t mutexattr;
|
|
+ int ret = 0;
|
|
+
|
|
+ if (pthread_mutexattr_init (&mutexattr) != 0)
|
|
+ return 1;
|
|
+ if (pthread_mutexattr_settype (&mutexattr, PTHREAD_MUTEX_ERRORCHECK) != 0)
|
|
+ return 1;
|
|
+
|
|
+ if (pthread_mutex_init (&mutex, &mutexattr) != 0)
|
|
+ return 1;
|
|
+ if (pthread_mutexattr_destroy (&mutexattr) != 0)
|
|
+ return 1;
|
|
+
|
|
+ /* The call to pthread_mutex_timedlock erroneously enabled lock elision
|
|
+ on the mutex, which then triggered an assertion failure in
|
|
+ pthread_mutex_unlock. It would also defeat the error checking nature
|
|
+ of the mutex. */
|
|
+ if (pthread_mutex_timedlock (&mutex, &tms) != 0)
|
|
+ return 1;
|
|
+ if (pthread_mutex_timedlock (&mutex, &tms) != EDEADLK)
|
|
+ {
|
|
+ printf ("Failed error checking on locked mutex\n");
|
|
+ ret = 1;
|
|
+ }
|
|
+
|
|
+ if (pthread_mutex_unlock (&mutex) != 0)
|
|
+ ret = 1;
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+#define TEST_FUNCTION do_test ()
|
|
+#include "../test-skeleton.c"
|