From d81f564b1ba07d3a6653cb759e7bc65139ba49c6 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 5 Jan 2012 16:11:57 +0100 Subject: glibc-2.14.1: add patch to fix libdl crash Signed-off-by: Michael Olbrich --- patches/glibc-2.14.1/0021-fix-libdl-crash.patch | 148 ++++++++++++++++++++++++ patches/glibc-2.14.1/series | 3 +- 2 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 patches/glibc-2.14.1/0021-fix-libdl-crash.patch (limited to 'patches') diff --git a/patches/glibc-2.14.1/0021-fix-libdl-crash.patch b/patches/glibc-2.14.1/0021-fix-libdl-crash.patch new file mode 100644 index 0000000..6da75a5 --- /dev/null +++ b/patches/glibc-2.14.1/0021-fix-libdl-crash.patch @@ -0,0 +1,148 @@ +From: Michael Olbrich +Date: Thu, 5 Jan 2012 15:26:47 +0100 +Subject: [PATCH] fix libdl crash + +taken from openembedded: + +Without this patch programs using alsa-lib crash (alsamixer for example). +Removed Copyright reverts + +Upstream-Status: Pending + +http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 +http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html + +many distributions are using this already +http://chakra-project.org/ccr/packages/glibc/glibc/PKGBUILD +http://mailman.archlinux.org/pipermail/arch-commits/2011-June/137142.html +http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/glibc/current/SOURCES/glibc-2.14-libdl-crash.patch?view=markup&pathrev=691343 +http://repos.archlinuxppc.org/wsvn/filedetails.php?repname=packages&path=%2Fglibc%2Ftrunk%2Fglibc-2.14-libdl-crash.patch + +Signed-off-by: Michael Olbrich +--- + elf/dl-close.c | 13 ++----------- + elf/dl-deps.c | 4 +++- + elf/dl-libc.c | 6 +++++- + elf/rtld.c | 1 + + include/link.h | 6 +++--- + 5 files changed, 14 insertions(+), 16 deletions(-) + +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 02df0d0..831a662 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -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 7fa4d69..10a251f 100644 +--- a/elf/dl-deps.c ++++ b/elf/dl-deps.c +@@ -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. */ +@@ -678,6 +679,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 (); +@@ -686,7 +688,7 @@ 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); + + if (errno_reason) + _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, +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) + + for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) + { +- /* Remove all additional names added to the objects. */ + for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) + { + struct libname_list *lnp = l->l_libname->next; + + l->l_libname->next = NULL; + ++ /* Remove all additional names added to the objects. */ + while (lnp != NULL) + { + struct libname_list *old = lnp; +@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) + if (! old->dont_free) + free (old); + } ++ ++ /* 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 9eb9289..32d745a 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2263,6 +2263,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 (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..b1b4065 100644 +--- a/include/link.h ++++ b/include/link.h +@@ -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; + + /* List of the dependencies introduced through symbol binding. */ + struct link_map_reldeps diff --git a/patches/glibc-2.14.1/series b/patches/glibc-2.14.1/series index c337ca5..d379bcc 100644 --- a/patches/glibc-2.14.1/series +++ b/patches/glibc-2.14.1/series @@ -20,4 +20,5 @@ 0018-optimized-string-functions-for-NEON-from-Linaro.patch 0019-add-libc_hidden_builtin_def-for-all-cortex-functions.patch 0020-revert-sunrpc-removal.patch -# 00982701c958f3ef1fb77c5fa12126c3 - git-ptx-patches magic +0021-fix-libdl-crash.patch +# 3609589c1fca6c85cdfb41d7b6bac0a2 - git-ptx-patches magic -- cgit v1.2.3