From 81313e32ef1885c1cb884042398b299df11f3e3c Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 31 Aug 2011 15:48:43 -0700 Subject: Revert "Fix memory leak in dlopen with RTLD_NOLOAD." This reverts commit 522cb50e61c109d41df4dbc366312a133e248dca. Conflicts: ChangeLog --- ChangeLog | 18 ------------------ elf/Makefile | 6 +----- elf/dl-close.c | 15 +++------------ elf/dl-deps.c | 2 +- elf/dl-load.c | 2 -- elf/noload.c | 22 ++++++---------------- include/link.h | 5 +---- 7 files changed, 12 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84def3c4cc..d05deb464e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -173,24 +173,6 @@ * libio/fmemopen.c (fmemopen): Don't read past end of buffer. -2011-02-23 Andreas Schwab - Ulrich Drepper - - [BZ #12509] - * include/link.h (struct link_map): Add l_orig_initfini. - * elf/dl-load.c (_dl_map_object_from_fd): Free realname before - returning unsuccessfully. - * elf/dl-close.c (_dl_close_worker): If this is the last explicit - close of a file loaded at startup, restore the original l_initfini - list. - * elf/dl-deps.c (_dl_map_object_deps): Don't free old l_initfini - list, store the pointer. - * elf/Makefile ($(objpfx)noload-mem): New rule. - (noload-ENV): Define. - (tests): Add $(objpfx)noload-mem. - * elf/noload.c: Include . - (main): Call mtrace. Close all opened handles. - 2011-02-17 Andreas Schwab [BZ #12454] diff --git a/elf/Makefile b/elf/Makefile index addb086d6e..34609a0f85 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -209,7 +209,7 @@ endif ifeq (yesyes,$(have-fpie)$(build-shared)) tests: $(objpfx)tst-pie1.out endif -tests: $(objpfx)tst-leaks1-mem $(objpfx)noload-mem +tests: $(objpfx)tst-leaks1-mem tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ @@ -658,10 +658,6 @@ $(objpfx)noload: $(objpfx)testobj1.so LDFLAGS-noload = -rdynamic $(objpfx)noload.out: $(objpfx)testobj5.so -$(objpfx)noload-mem: $(objpfx)noload.out - $(common-objpfx)malloc/mtrace $(objpfx)noload.mtrace > $@ -noload-ENV = MALLOC_TRACE=$(objpfx)noload.mtrace - LDFLAGS-nodelete = -rdynamic LDFLAGS-nodelmod1.so = -Wl,--enable-new-dtags,-z,nodelete LDFLAGS-nodelmod4.so = -Wl,--enable-new-dtags,-z,nodelete diff --git a/elf/dl-close.c b/elf/dl-close.c index e1940da2d0..b73a7adb1a 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -1,5 +1,5 @@ /* Close a shared object opened by `_dl_open'. - Copyright (C) 1996-2007, 2009, 2011 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009 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 @@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) if (map->l_direct_opencount > 0 || map->l_type != lt_loaded || dl_close_state != not_pending) { - if (map->l_direct_opencount == 0) - { - if (map->l_type == lt_loaded) - dl_close_state = rerun; - else if (map->l_type == lt_library) - { - struct link_map **oldp = map->l_initfini; - map->l_initfini = map->l_orig_initfini; - _dl_scope_free (oldp); - } - } + if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) + dl_close_state = rerun; /* There are still references to this object. Do nothing more. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) diff --git a/elf/dl-deps.c b/elf/dl-deps.c index 06fcabb69b..b2f6a46e56 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -669,5 +669,5 @@ Filters not supported with LD_TRACE_PRELINKING")); _dl_scope_free (old_l_reldeps); } if (old_l_initfini != NULL) - map->l_orig_initfini = old_l_initfini; + _dl_scope_free (old_l_initfini); } diff --git a/elf/dl-load.c b/elf/dl-load.c index aa525f3511..72e78be355 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -987,7 +987,6 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, { /* We are not supposed to load the object unless it is already loaded. So return now. */ - free (realname); __close (fd); return NULL; } @@ -1006,7 +1005,6 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, _dl_zerofd = _dl_sysdep_open_zero_fill (); if (_dl_zerofd == -1) { - free (realname); __close (fd); _dl_signal_error (errno, NULL, NULL, N_("cannot open zero fill device")); diff --git a/elf/noload.c b/elf/noload.c index bcc85efc27..9281ec714c 100644 --- a/elf/noload.c +++ b/elf/noload.c @@ -1,28 +1,20 @@ #include #include -#include int main (void) { int result = 0; - void *p; - - mtrace (); /* First try to load an object which is a dependency. This should succeed. */ - p = dlopen ("testobj1.so", RTLD_LAZY | RTLD_NOLOAD); - if (p == NULL) + if (dlopen ("testobj1.so", RTLD_LAZY | RTLD_NOLOAD) == NULL) { printf ("cannot open \"testobj1.so\": %s\n", dlerror ()); result = 1; } else - { - puts ("loading \"testobj1.so\" succeeded, OK"); - dlclose (p); - } + puts ("loading \"testobj1.so\" succeeded, OK"); /* Now try loading an object which is not already loaded. */ if (dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD) != NULL) @@ -33,6 +25,8 @@ main (void) else { /* Load the object and run the same test again. */ + void *p; + puts ("\"testobj5.so\" wasn't loaded and RTLD_NOLOAD prevented it, OK"); p = dlopen ("testobj5.so", RTLD_LAZY); @@ -47,17 +41,13 @@ main (void) { puts ("loading \"testobj5.so\" succeeded, OK"); - void *q = dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD); - if (q == NULL) + if (dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD) == NULL) { printf ("cannot open \"testobj5.so\": %s\n", dlerror ()); result = 1; } else - { - puts ("loading \"testobj5.so\" with RTLD_NOLOAD succeeded, OK"); - dlclose (q); - } + puts ("loading \"testobj5.so\" with RTLD_NOLOAD succeeded, OK"); if (dlclose (p) != 0) { diff --git a/include/link.h b/include/link.h index e1700b1490..26c67438f0 100644 --- a/include/link.h +++ b/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. - Copyright (C) 1995-2006, 2007, 2009, 2011 Free Software Foundation, Inc. + Copyright (C) 1995-2006, 2007, 2009 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 @@ -236,9 +236,6 @@ struct link_map /* List of object in order of the init and fini calls. */ struct link_map **l_initfini; - /* The init and fini list generated at startup, saved when the - object is also loaded dynamically. */ - struct link_map **l_orig_initfini; /* List of the dependencies introduced through symbol binding. */ struct link_map_reldeps -- cgit 1.4.1