packages: glibc/glibc.spec, glibc/glibc-bad-fix.patch - better fix from gli...
pluto
pluto at pld-linux.org
Sun Jun 5 10:46:56 CEST 2011
Author: pluto Date: Sun Jun 5 08:46:56 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- better fix from glibc-fedora branch, release 4.
---- Files affected:
packages/glibc:
glibc.spec (1.910 -> 1.911) , glibc-bad-fix.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/glibc/glibc.spec
diff -u packages/glibc/glibc.spec:1.910 packages/glibc/glibc.spec:1.911
--- packages/glibc/glibc.spec:1.910 Sat Jun 4 18:52:56 2011
+++ packages/glibc/glibc.spec Sun Jun 5 10:46:51 2011
@@ -36,7 +36,7 @@
Summary(uk.UTF-8): GNU libc версії
Name: glibc
Version: 2.14
-Release: 3
+Release: 4
Epoch: 6
License: LGPL v2.1+
Group: Libraries
@@ -84,12 +84,7 @@
Patch37: 0061_all_glibc-2.13-static-memset.patch
Patch38: 1055_all_glibc-resolv-dynamic.patch
Patch39: %{name}-git.patch
-
-# revert regression introduced in:
-# commit 4bff6e0175ed195871f4e01cc4c4c33274b8f6e3
-# Fix memory leak in dlopen with RTLD_NOLOAD.
Patch40: %{name}-bad-fix.patch
-
URL: http://www.gnu.org/software/libc/
%{?with_selinux:BuildRequires: audit-libs-devel}
BuildRequires: autoconf
@@ -948,7 +943,7 @@
%patch37 -p1
%patch38 -p1
%patch39 -p1
-%patch40 -p1 -R
+%patch40 -p1
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -1740,6 +1735,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.911 2011/06/05 08:46:51 pluto
+- better fix from glibc-fedora branch, release 4.
+
Revision 1.910 2011/06/04 16:52:56 pluto
- desc patch40 (regression revert).
================================================================
Index: packages/glibc/glibc-bad-fix.patch
diff -u packages/glibc/glibc-bad-fix.patch:1.1 packages/glibc/glibc-bad-fix.patch:1.2
--- packages/glibc/glibc-bad-fix.patch:1.1 Sat Jun 4 18:08:51 2011
+++ packages/glibc/glibc-bad-fix.patch Sun Jun 5 10:46:51 2011
@@ -1,160 +1,137 @@
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -213,7 +213,7 @@ endif
- ifeq (yesyes,$(have-fpie)$(build-shared))
- tests: $(objpfx)tst-pie1.out
- endif
--tests: $(objpfx)tst-leaks1-mem
-+tests: $(objpfx)tst-leaks1-mem $(objpfx)noload-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
- tlsmod17a-modules = $(addprefix tst-tlsmod17a, $(tlsmod17a-suffixes))
-@@ -680,6 +680,10 @@ $(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.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
+From 675155e9084e060fd0e1e637b843f14e82898aa5 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab at redhat.com>
+Date: Wed, 22 Sep 2010 12:06:30 +0200
+Subject: [PATCH] Fix memory leak on init/fini dependency list
+
+diff --git a/elf/dl-close.c b/elf/dl-close.c
+index 73b2a2f..9bd91e3 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, 2010 Free Software Foundation, Inc.
-+ Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++ Copyright (C) 1996-2007, 2009, 2010 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 @@ _dl_close_worker (struct link_map *map)
+@@ -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 && 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);
-+ }
-+ }
+- 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 9e30594..3890d00 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
-@@ -686,5 +686,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
+@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
+ nneeded * sizeof needed[0]);
+ atomic_write_barrier ();
+ l->l_initfini = l_initfini;
++ l->l_free_initfini = 1;
+ }
+
+ /* If we have no auxiliary objects just go on to the next map. */
+@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
+ l_initfini[nlist] = NULL;
+ atomic_write_barrier ();
+ map->l_initfini = l_initfini;
++ map->l_free_initfini = 1;
+ if (l_reldeps != NULL)
+ {
+ atomic_write_barrier ();
+@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
_dl_scope_free (old_l_reldeps);
}
if (old_l_initfini != NULL)
-- _dl_scope_free (old_l_initfini);
-+ map->l_orig_initfini = old_l_initfini;
+- map->l_orig_initfini = old_l_initfini;
++ _dl_scope_free (old_l_initfini);
}
---- a/elf/dl-load.c
-+++ b/elf/dl-load.c
-@@ -894,6 +894,7 @@ _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;
- }
-@@ -912,6 +913,7 @@ _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"));
---- a/elf/noload.c
-+++ b/elf/noload.c
-@@ -1,20 +1,28 @@
- #include <dlfcn.h>
- #include <stdio.h>
-+#include <mcheck.h>
-
- int
- main (void)
- {
- int result = 0;
-+ void *p;
-+
-+ mtrace ();
+diff --git a/elf/dl-libc.c b/elf/dl-libc.c
+index 7be9483..a13fce3 100644
+--- a/elf/dl-libc.c
++++ b/elf/dl-libc.c
+@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
- /* First try to load an object which is a dependency. This should
- succeed. */
-- if (dlopen ("testobj1.so", RTLD_LAZY | RTLD_NOLOAD) == NULL)
-+ p = dlopen ("testobj1.so", RTLD_LAZY | RTLD_NOLOAD);
-+ if (p == NULL)
+ for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
{
- printf ("cannot open \"testobj1.so\": %s\n", dlerror ());
- result = 1;
- }
- else
-- puts ("loading \"testobj1.so\" succeeded, OK");
-+ {
-+ puts ("loading \"testobj1.so\" succeeded, OK");
-+ dlclose (p);
-+ }
-
- /* Now try loading an object which is not already loaded. */
- if (dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD) != NULL)
-@@ -25,8 +33,6 @@ 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);
-@@ -41,13 +47,17 @@ main (void)
+- /* Remove all additional names added to the objects. */
+ for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
{
- puts ("loading \"testobj5.so\" succeeded, OK");
+ struct libname_list *lnp = l->l_libname->next;
+
+ l->l_libname->next = NULL;
-- if (dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD) == NULL)
-+ void *q = dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD);
-+ if (q == NULL)
++ /* Remove all additional names added to the objects. */
+ while (lnp != NULL)
{
- printf ("cannot open \"testobj5.so\": %s\n", dlerror ());
- result = 1;
+ struct libname_list *old = lnp;
+@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
+ if (! old->dont_free)
+ free (old);
}
- else
-- puts ("loading \"testobj5.so\" with RTLD_NOLOAD succeeded, OK");
-+ {
-+ puts ("loading \"testobj5.so\" with RTLD_NOLOAD succeeded, OK");
-+ dlclose (q);
-+ }
++
++ /* Free the initfini dependency list. */
++ if (l->l_free_initfini)
++ free (l->l_initfini);
+ }
+
+ if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 4a9109e..617e30e 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+ lnp->dont_free = 1;
+ lnp = lnp->next;
+ }
++ l->l_free_initfini = 0;
- if (dlclose (p) != 0)
- {
+ if (l != &GL(dl_rtld_map))
+ _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
+diff --git a/include/link.h b/include/link.h
+index e877104..051b99a 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, 2010 Free Software Foundation, Inc.
-+ Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++ Copyright (C) 1995-2006, 2007, 2009, 2010 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 @@ struct link_map
+@@ -192,6 +192,9 @@ struct link_map
+ during LD_TRACE_PRELINKING=1
+ contains any DT_SYMBOLIC
+ libraries. */
++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
++ freed, ie. not allocated with
++ the dummy malloc in ld.so. */
+
+ /* Collected information about own RPATH directories. */
+ struct r_search_path_struct l_rpath_dirs;
+@@ -240,9 +243,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;
+- /* 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glibc/glibc.spec?r1=1.910&r2=1.911&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glibc/glibc-bad-fix.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list