about summary refs log tree commit diff
path: root/elf/tst-dlmopen-gethostbyname.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-06-17 15:06:43 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-06-17 15:06:46 +0200
commitc2059edce20c124d1a99f1a94cc52e83b77a917a (patch)
tree08b9d89f127ae910b2da7d9882b7143549b26882 /elf/tst-dlmopen-gethostbyname.c
parent6b229222fc2852775d8adac2a12f6180b32c5cea (diff)
downloadglibc-c2059edce20c124d1a99f1a94cc52e83b77a917a.tar.gz
glibc-c2059edce20c124d1a99f1a94cc52e83b77a917a.tar.xz
glibc-c2059edce20c124d1a99f1a94cc52e83b77a917a.zip
elf: Use _dl_catch_error from base namespace in dl-libc.c [BZ #27646]
dlerrror_run in elf/dl-libc.c needs to call GLRO (dl_catch_error)
from the base namespace, just like the exported dlerror
implementation.

Fixes commit b2964eb1d9a6b8ab1250e8a881cf406182da5875 ("dlfcn:
Failures after dlmopen should not terminate process [BZ #24772]").

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Diffstat (limited to 'elf/tst-dlmopen-gethostbyname.c')
-rw-r--r--elf/tst-dlmopen-gethostbyname.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/elf/tst-dlmopen-gethostbyname.c b/elf/tst-dlmopen-gethostbyname.c
new file mode 100644
index 0000000000..12deb29900
--- /dev/null
+++ b/elf/tst-dlmopen-gethostbyname.c
@@ -0,0 +1,31 @@
+/* Exercise dlerror_run in elf/dl-libc.c after dlmopen, via NSS (bug 27646).
+   Copyright (C) 2021 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <support/xdlfcn.h>
+
+static int
+do_test (void)
+{
+  void *handle = xdlmopen (LM_ID_NEWLM, "tst-dlmopen-gethostbyname-mod.so",
+                           RTLD_NOW);
+  void (*call_gethostbyname) (void) = xdlsym (handle, "call_gethostbyname");
+  call_gethostbyname ();
+  return 0;
+}
+
+#include <support/test-driver.c>