diff mbox series

elf: Call free from base namespace on error in dl-libc.c [BZ #27646]

Message ID 87zguzfyvk.fsf@oldenburg.str.redhat.com
State Committed
Commit 832f50be6c9c010e46180d14126bbb81f35e808c
Headers show
Series elf: Call free from base namespace on error in dl-libc.c [BZ #27646] | expand

Checks

Context Check Description
dj/TryBot-32bit success Build for i686
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Florian Weimer July 6, 2021, 11:46 a.m. UTC
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]").

---
 elf/dl-libc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andreas Schwab July 6, 2021, 11:59 a.m. UTC | #1
Ok.

Andreas.
diff mbox series

Patch

diff --git a/elf/dl-libc.c b/elf/dl-libc.c
index a49df22029..ba792e9589 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;
 }