AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-28 07:41:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

(_dl_close): Handle relocation dependencies among the to-be-deleted objects right away instead of later separately. The latter fails because the scope data structures of the DSO might already have gone.

Browse Source
This commit is contained in:
Ulrich Drepper 2002-12-30 21:15:31 +00:00
parent cfaf5e56c8
commit 556224abb0
2 changed files with 69 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elf/Makefile
View File

@ -363,7 +363,7 @@ $(objpfx)reldep6mod2.so: $(objpfx)reldep6mod1.so
$(objpfx)reldep6mod3.so: $(objpfx)reldep6mod2.so $(objpfx)reldep6mod3.so: $(objpfx)reldep6mod2.so
$(objpfx)reldep6mod4.so: $(objpfx)reldep6mod1.so $(objpfx)reldep6mod4.so: $(objpfx)reldep6mod1.so
$(objpfx)tst-tlsmod3.so: $(objpfx)tst-tlsmod2.so $(objpfx)tst-tlsmod3.so: $(objpfx)tst-tlsmod2.so
$(objpfx)reldepmod3.so: $(objpfx)reldepmod1.so $(objpfx)reldepmod2.so $(objpfx)reldep8mod3.so: $(objpfx)reldep8mod1.so $(objpfx)reldep8mod2.so
LDFLAGS-tst-tlsmod5.so = -nostdlib LDFLAGS-tst-tlsmod5.so = -nostdlib
LDFLAGS-tst-tlsmod6.so = -nostdlib LDFLAGS-tst-tlsmod6.so = -nostdlib

66
elf/dl-close.c
View File

@ -106,7 +106,9 @@ _dl_close (void *_map)
{ {
struct link_map **rellist; struct link_map **rellist;
unsigned int nrellist; unsigned int nrellist;
unsigned int nhandled;
struct reldep_list *next; struct reldep_list *next;
bool handled[0];
} *reldeps = NULL; } *reldeps = NULL;
struct link_map **list; struct link_map **list;
struct link_map *map = _map; struct link_map *map = _map;
@ -153,6 +155,7 @@ _dl_close (void *_map)
for (i = 1; list[i] != NULL; ++i) for (i = 1; list[i] != NULL; ++i)
; ;
unsigned int nopencount = i;
new_opencount = (unsigned int *) alloca (i * sizeof (unsigned int)); new_opencount = (unsigned int *) alloca (i * sizeof (unsigned int));
for (i = 0; list[i] != NULL; ++i) for (i = 0; list[i] != NULL; ++i)
@ -164,23 +167,47 @@ _dl_close (void *_map)
for (i = 1; list[i] != NULL; ++i) for (i = 1; list[i] != NULL; ++i)
if ((! (list[i]->l_flags_1 & DF_1_NODELETE) || ! list[i]->l_init_called) if ((! (list[i]->l_flags_1 & DF_1_NODELETE) || ! list[i]->l_init_called)
/* Decrement counter. */ /* Decrement counter. */
&& --new_opencount[i] == 0 && --new_opencount[i] == 0)
/* Test whether this object was also loaded directly. */
&& list[i]->l_searchlist.r_list != NULL)
{ {
/* In this case we have the decrement all the dependencies of void mark_removed (struct link_map *remmap)
{
/* Test whether this object was also loaded directly. */
if (remmap->l_searchlist.r_list != NULL)
{
/* In this case we have to decrement all the dependencies of
this object. They are all in MAP's dependency list. */ this object. They are all in MAP's dependency list. */
unsigned int j; unsigned int j;
struct link_map **dep_list = list[i]->l_searchlist.r_list; struct link_map **dep_list = remmap->l_searchlist.r_list;
for (j = 1; j < list[i]->l_searchlist.r_nlist; ++j) for (j = 1; j < remmap->l_searchlist.r_nlist; ++j)
if (! (dep_list[j]->l_flags_1 & DF_1_NODELETE) if (! (dep_list[j]->l_flags_1 & DF_1_NODELETE)
|| ! dep_list[j]->l_init_called) || ! dep_list[j]->l_init_called)
{ {
assert (dep_list[j]->l_idx < map->l_searchlist.r_nlist); assert (dep_list[j]->l_idx < map->l_searchlist.r_nlist);
--new_opencount[dep_list[j]->l_idx]; if (--new_opencount[dep_list[j]->l_idx] == 0)
mark_removed (dep_list[j]);
} }
} }
if (remmap->l_reldeps != NULL)
{
unsigned int j;
for (j = 0; j < remmap->l_reldepsact; ++j)
{
/* Find out whether this object is in our list. */
if (remmap->l_reldeps[j]->l_idx < nopencount
&& (list[remmap->l_reldeps[j]->l_idx]
== remmap->l_reldeps[j]))
/* Yes, it is. */
if (--new_opencount[remmap->l_reldeps[j]->l_idx] == 0)
/* This one is now gone, too. */
mark_removed (remmap->l_reldeps[j]);
}
}
}
mark_removed (list[i]);
}
assert (new_opencount[0] == 0); assert (new_opencount[0] == 0);
/* Call all termination functions at once. */ /* Call all termination functions at once. */
@ -339,9 +366,8 @@ _dl_close (void *_map)
if (imap->l_next) if (imap->l_next)
imap->l_next->l_prev = imap->l_prev; imap->l_next->l_prev = imap->l_prev;
if (imap->l_versions != NULL)
free (imap->l_versions); free (imap->l_versions);
if (imap->l_origin != NULL && imap->l_origin != (char *) -1) if (imap->l_origin != (char *) -1)
free ((char *) imap->l_origin); free ((char *) imap->l_origin);
/* If the object has relocation dependencies save this /* If the object has relocation dependencies save this
@ -350,11 +376,26 @@ _dl_close (void *_map)
{ {
struct reldep_list *newrel; struct reldep_list *newrel;
newrel = (struct reldep_list *) alloca (sizeof (*reldeps)); newrel = (struct reldep_list *) alloca (sizeof (*reldeps)
+ (imap->l_reldepsact
* sizeof (bool)));
newrel->rellist = imap->l_reldeps; newrel->rellist = imap->l_reldeps;
newrel->nrellist = imap->l_reldepsact; newrel->nrellist = imap->l_reldepsact;
newrel->next = reldeps; newrel->next = reldeps;
newrel->nhandled = imap->l_reldepsact;
unsigned int j;
for (j = 0; j < imap->l_reldepsact; ++j)
{
/* Find out whether this object is in our list. */
if (imap->l_reldeps[j]->l_idx < nopencount
&& list[imap->l_reldeps[j]->l_idx] == imap->l_reldeps[j])
/* Yes, it is. */
newrel->handled[j] = true;
else
newrel->handled[j] = false;
}
reldeps = newrel; reldeps = newrel;
} }
@ -412,6 +453,11 @@ _dl_close (void *_map)
while (__builtin_expect (reldeps != NULL, 0)) while (__builtin_expect (reldeps != NULL, 0))
{ {
while (reldeps->nrellist-- > 0) while (reldeps->nrellist-- > 0)
/* Some of the relocation dependencies might be on the
dependency list of the object we are closing right now.
They were already handled. Do not close them again. */
if (reldeps->nrellist < reldeps->nhandled
&& ! reldeps->handled[reldeps->nrellist])
_dl_close (reldeps->rellist[reldeps->nrellist]); _dl_close (reldeps->rellist[reldeps->nrellist]);
free (reldeps->rellist); free (reldeps->rellist);