[PATCH] Skip checks in pthread_mutex_destroy when doing elision

[Andreas Schwab <schwab at suse dot de>]

When doing elisison the __nusers field is not updated, thus can have an
arbitrary value.

	[BZ #16657]
	* nptl/pthread_mutex_destroy.c (__pthread_mutex_destroy): Skip
	checks when doing elision.
	* nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_destroy.c: New file.
---
 nptl/pthread_mutex_destroy.c                       |  6 +++++-
 .../unix/sysv/linux/x86/pthread_mutex_destroy.c    | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_destroy.c

diff --git a/nptl/pthread_mutex_destroy.c b/nptl/pthread_mutex_destroy.c
index 35a2dfe..f6bd6d9 100644
--- a/nptl/pthread_mutex_destroy.c
+++ b/nptl/pthread_mutex_destroy.c
@@ -21,6 +21,9 @@
 
 #include <stap-probe.h>
 
+#ifndef DO_ELISION
+# define DO_ELISION(m) 0
+#endif
 
 int
 __pthread_mutex_destroy (mutex)
@@ -28,7 +31,8 @@ __pthread_mutex_destroy (mutex)
 {
   LIBC_PROBE (mutex_destroy, 1, mutex);
 
-  if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0
+  if (!DO_ELISION (mutex)
+      && (mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0
       && mutex->__data.__nusers != 0)
     return EBUSY;
 
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_destroy.c b/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_destroy.c
new file mode 100644
index 0000000..b125f75
--- /dev/null
+++ b/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_destroy.c
@@ -0,0 +1,22 @@
+/* Elided version of pthread_mutex_destroy.
+   Copyright (C) 2014 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 <elision-conf.h>
+#include "force-elision.h"
+
+#include "nptl/pthread_mutex_destroy.c"
-- 
1.9.1


-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."