r4549 - in glibc-package/branches/eglibc-2.13/debian: . patches patches/any
Author: aurel32
Date: 2011-02-27 20:49:17 +0000 (Sun, 27 Feb 2011)
New Revision: 4549
Removed:
glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dlopen_memory_leak.diff
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/patches/series
Log:
Revert r4531
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-26 20:28:09 UTC (rev 4548)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-27 20:49:17 UTC (rev 4549)
@@ -118,8 +118,6 @@
EGLIBC_RTLD_DEBUG support on non NPTL systems.
* Add patches/any/local-relro-mprotect.patch to not crash with PaX
kernels. Closes: #611195.
- * Add patches/any/cvs-dlopen_memory_leak.diff to fix a memory leak
- in dlopen(). Closes: #195888.
* Add patches/any/cvs-dl-missing-deps.diff to output an early error
when dependencies are missing. Closes: #612792.
* Add patches/any/cvs-rtld-prelink.diff to fix segfault on prelinked
Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dlopen_memory_leak.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dlopen_memory_leak.diff 2011-02-26 20:28:09 UTC (rev 4548)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dlopen_memory_leak.diff 2011-02-27 20:49:17 UTC (rev 4549)
@@ -1,101 +0,0 @@
-2011-02-23 Andreas Schwab <schwab@redhat.com>
- Ulrich Drepper <drepper@gmail.com>
-
- [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 <memcheck.h>.
- (main): Call mtrace. Close all opened handles.
-
----
- elf/dl-close.c | 15 ++++++++++++---
- elf/dl-deps.c | 2 +-
- elf/dl-load.c | 2 ++
- include/link.h | 5 ++++-
- 4 files changed, 19 insertions(+), 5 deletions(-)
-
---- 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, 2010 Free Software Foundation, Inc.
-+ Copyright (C) 1996-2007, 2009, 2010, 2011 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,8 +119,17 @@
- if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
- || dl_close_state != not_pending)
- {
-- if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-- dl_close_state = rerun;
-+ 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);
-+ }
-+ }
-
- /* There are still references to this object. Do nothing more. */
- if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0))
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -686,5 +686,5 @@
- _dl_scope_free (old_l_reldeps);
- }
- if (old_l_initfini != NULL)
-- _dl_scope_free (old_l_initfini);
-+ map->l_orig_initfini = old_l_initfini;
- }
---- a/elf/dl-load.c
-+++ b/elf/dl-load.c
-@@ -894,6 +894,7 @@
- {
- /* We are not supposed to load the object unless it is already
- loaded. So return now. */
-+ free (realname);
- __close (fd);
- return NULL;
- }
-@@ -912,6 +913,7 @@
- _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"));
---- 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, 2010 Free Software Foundation, Inc.
-+ Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 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
-@@ -240,6 +240,9 @@
-
- /* 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
Modified: glibc-package/branches/eglibc-2.13/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-26 20:28:09 UTC (rev 4548)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-27 20:49:17 UTC (rev 4549)
@@ -221,4 +221,3 @@
any/local-relro-mprotect.diff
any/cvs-dl-missing-deps.diff
any/cvs-rtld-prelink.diff
-any/cvs-dlopen_memory_leak.diff
Reply to: