diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-07-06 13:22:01 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-07-06 14:30:33 +0200 |
| commit | 832f50be6c9c010e46180d14126bbb81f35e808c (patch) | |
| tree | afd34449cc9c4335a333643e6a1d4fe7dfc81c1a /elf/dl-libc.c | |
| parent | c8935581de4ff931bc32fb03da5d87f0ee2378a1 (diff) | |
| download | glibc-832f50be6c9c010e46180d14126bbb81f35e808c.zip glibc-832f50be6c9c010e46180d14126bbb81f35e808c.tar.gz glibc-832f50be6c9c010e46180d14126bbb81f35e808c.tar.bz2 | |
elf: Call free from base namespace on error in dl-libc.c [BZ #27646]
In dlerror_run, free corresponds to the local malloc in the
namespace, but GLRO (dl_catch_error) uses the malloc from the base
namespace. elf/tst-dlmopen-gethostbyname triggers this mismatch,
but it does not crash, presumably because of a fastbin deallocation.
Fixes commit c2059edce20c124d1a99f1a94cc52e83b77a917a ("elf: Use
_dl_catch_error from base namespace in dl-libc.c [BZ #27646]") and
commit b2964eb1d9a6b8ab1250e8a881cf406182da5875 ("dlfcn: Failures
after dlmopen should not terminate process [BZ #24772]").
Diffstat (limited to 'elf/dl-libc.c')
| -rw-r--r-- | elf/dl-libc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/dl-libc.c b/elf/dl-libc.c index a49df22..ba792e9 100644 --- a/elf/dl-libc.c +++ b/elf/dl-libc.c @@ -48,7 +48,7 @@ dlerror_run (void (*operate) (void *), void *args) ?: last_errstring != NULL); if (result && malloced) - free ((char *) last_errstring); + GLRO (dl_error_free) ((char *) last_errstring); return result; } |