diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-17 15:06:43 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-17 15:06:46 +0200 |
| commit | c2059edce20c124d1a99f1a94cc52e83b77a917a (patch) | |
| tree | 08b9d89f127ae910b2da7d9882b7143549b26882 /elf/dl-libc.c | |
| parent | 6b229222fc2852775d8adac2a12f6180b32c5cea (diff) | |
| download | glibc-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/dl-libc.c')
| -rw-r--r-- | elf/dl-libc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/dl-libc.c b/elf/dl-libc.c index 8e0734f44c..a49df22029 100644 --- a/elf/dl-libc.c +++ b/elf/dl-libc.c @@ -43,8 +43,8 @@ dlerror_run (void (*operate) (void *), void *args) const char *last_errstring = NULL; bool malloced; - int result = (_dl_catch_error (&objname, &last_errstring, &malloced, - operate, args) + int result = (GLRO (dl_catch_error) (&objname, &last_errstring, &malloced, + operate, args) ?: last_errstring != NULL); if (result && malloced) |