mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
eglibc-2.14: add patch to fix libdl crash
* Without this patch programs using alsa-lib crash (alsamixer for example). * This patch is taken verbatim from ArchLinux. (From OE-Core rev: 2d2ac8bbbbb98080ad339113c3f27f9573374be2) Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
f617af4ea3
commit
88f81c7ffe
@@ -0,0 +1,131 @@
|
|||||||
|
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
|
||||||
|
|
||||||
|
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
|
||||||
|
@@ -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 9e30594..3890d00 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. */
|
||||||
|
@@ -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)
|
||||||
|
- map->l_orig_initfini = old_l_initfini;
|
||||||
|
+ _dl_scope_free (old_l_initfini);
|
||||||
|
}
|
||||||
|
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 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 (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
|
||||||
|
@@ -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
|
||||||
@@ -3,7 +3,7 @@ require eglibc.inc
|
|||||||
SRCREV = "15225"
|
SRCREV = "15225"
|
||||||
|
|
||||||
DEPENDS += "gperf-native"
|
DEPENDS += "gperf-native"
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
PR_append = "+svnr${SRCPV}"
|
PR_append = "+svnr${SRCPV}"
|
||||||
|
|
||||||
EGLIBC_BRANCH="eglibc-2_14"
|
EGLIBC_BRANCH="eglibc-2_14"
|
||||||
@@ -19,7 +19,8 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
|
|||||||
file://ppc-sqrt.patch \
|
file://ppc-sqrt.patch \
|
||||||
file://multilib_readlib.patch \
|
file://multilib_readlib.patch \
|
||||||
file://eglibc-rpc-export-again.patch \
|
file://eglibc-rpc-export-again.patch \
|
||||||
"
|
file://glibc-2.14-libdl-crash.patch \
|
||||||
|
"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
|
LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
|
||||||
file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
|
file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
|
||||||
file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
|
file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
|
||||||
|
|||||||
Reference in New Issue
Block a user