about summary refs log tree commit diff
path: root/elf/tst-dlopen-aout.c
diff options
context:
space:
mode:
authorPaul Pluzhnikov <ppluzhnikov@google.com>2014-03-24 10:58:26 -0700
committerPaul Pluzhnikov <ppluzhnikov@google.com>2014-03-24 10:58:26 -0700
commita42faf59d6d9f82e5293a9ebcc26d9c9e562b12b (patch)
treea124669e62343e6b318af03c82a86a807773c334 /elf/tst-dlopen-aout.c
parent509361270b4b889e991400a70eb87d45304c01cd (diff)
downloadglibc-a42faf59d6d9f82e5293a9ebcc26d9c9e562b12b.tar.gz
glibc-a42faf59d6d9f82e5293a9ebcc26d9c9e562b12b.tar.xz
glibc-a42faf59d6d9f82e5293a9ebcc26d9c9e562b12b.zip
Fix BZ #16634.
An application that erroneously tries to repeatedly dlopen("a.out", ...)
may hit assertion failure:

  Inconsistency detected by ld.so: dl-tls.c: 474: _dl_allocate_tls_init:
  Assertion `listp != ((void *)0)' failed!

dlopen() actually fails with  "./a.out: cannot dynamically load executable",
but it does so after incrementing dl_tls_max_dtv_idx.

Once we run out of TLS_SLOTINFO_SURPLUS (62), we exit with above assertion
failure.

2014-03-24  Paul Pluzhnikov  <ppluzhnikov@google.com>

	[BZ #16634]

	* elf/dl-load.c (open_verify): Add mode parameter.
        Error early when ET_EXEC and mode does not have __RTLD_OPENEXEC.
        (open_path): Change from boolean 'secure' to complete flag 'mode'
        (_dl_map_object): Adjust.
	* elf/Makefile (tests): Add tst-dlopen-aout.
	* elf/tst-dlopen-aout.c: New test.
Diffstat (limited to 'elf/tst-dlopen-aout.c')
-rw-r--r--elf/tst-dlopen-aout.c61
1 files changed, 61 insertions, 0 deletions
diff --git a/elf/tst-dlopen-aout.c b/elf/tst-dlopen-aout.c
new file mode 100644
index 0000000000..d3534250e0
--- /dev/null
+++ b/elf/tst-dlopen-aout.c
@@ -0,0 +1,61 @@
+/* Test case for BZ #16634.
+
+   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/>.
+
+   Note: this test currently only fails when glibc is configured with
+   --enable-hardcoded-path-in-tests.  */
+
+#include <assert.h>
+#include <dlfcn.h>
+#include <stdio.h>
+#include <pthread.h>
+
+__thread int x;
+
+void *
+fn (void *p)
+{
+  return p;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int j;
+
+  for (j = 0; j < 100; ++j)
+    {
+      pthread_t thr;
+      void *p;
+      int rc;
+
+      p = dlopen (argv[0], RTLD_LAZY);
+      if (p != NULL)
+        {
+          fprintf (stderr, "dlopen unexpectedly succeeded\n");
+          return 1;
+        }
+      rc = pthread_create (&thr, NULL, fn, NULL);
+      assert (rc == 0);
+
+      rc = pthread_join (thr, NULL);
+      assert (rc == 0);
+    }
+
+  return 0;
+}