diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-10-14 11:02:25 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-10-14 11:02:25 +0200 |
| commit | 2c42257314536b94cc8d52edede86e94e98c1436 (patch) | |
| tree | d4bec9c9b8c21a41f097707a5257adbb2f950dde /elf/dl-open.c | |
| parent | 15a94e6668a6d7c5697e805d8d67f1d102d0d52e (diff) | |
| download | glibc-2c42257314536b94cc8d52edede86e94e98c1436.tar glibc-2c42257314536b94cc8d52edede86e94e98c1436.tar.gz glibc-2c42257314536b94cc8d52edede86e94e98c1436.tar.bz2 glibc-2c42257314536b94cc8d52edede86e94e98c1436.zip | |
elf: Do not completely clear reused namespace in dlmopen (bug 29600)
The data in the _ns_debug member must be preserved, otherwise
_dl_debug_initialize enters an infinite loop. To be conservative,
only clear the libc_map member for now, to fix bug 29528.
Fixes commit d0e357ff45a75553dee3b17ed7d303bfa544f6fe
("elf: Call __libc_early_init for reused namespaces (bug 29528)"),
by reverting most of it.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'elf/dl-open.c')
| -rw-r--r-- | elf/dl-open.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c index 46e8066fd8..e7db5e9642 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -844,15 +844,13 @@ _dl_open (const char *file, int mode, const void *caller_dlopen, Lmid_t nsid, _dl_signal_error (EINVAL, file, NULL, N_("\ no more namespaces available for dlmopen()")); } + else if (nsid == GL(dl_nns)) + { + __rtld_lock_initialize (GL(dl_ns)[nsid]._ns_unique_sym_table.lock); + ++GL(dl_nns); + } - if (nsid == GL(dl_nns)) - ++GL(dl_nns); - - /* Initialize the new namespace. Most members are - zero-initialized, only the lock needs special treatment. */ - memset (&GL(dl_ns)[nsid], 0, sizeof (GL(dl_ns)[nsid])); - __rtld_lock_initialize (GL(dl_ns)[nsid]._ns_unique_sym_table.lock); - + GL(dl_ns)[nsid].libc_map = NULL; _dl_debug_update (nsid)->r_state = RT_CONSISTENT; } /* Never allow loading a DSO in a namespace which is empty. Such |