diff options
Diffstat (limited to 'elf/dl-open.c')
| -rw-r--r-- | elf/dl-open.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c index 027c1e0..2db1c02 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -226,6 +226,12 @@ dl_open_worker (void *a) args->map = new = _dl_map_object (call_map, file, lt_loaded, 0, mode | __RTLD_CALLMAP, args->nsid); + /* Mark the object as not deletable if the RTLD_NODELETE flags was passed. + Do this early so that we don't skip marking the object if it was + already loaded. */ + if (__glibc_unlikely (mode & RTLD_NODELETE)) + new->l_flags_1 |= DF_1_NODELETE; + /* If the pointer returned is NULL this means the RTLD_NOLOAD flag is set and the object is not already loaded. */ if (new == NULL) @@ -564,11 +570,6 @@ TLS generation counter wrapped! Please report this.")); /* It failed. */ return; - /* Mark the object as not deletable if the RTLD_NODELETE flags was - passed. */ - if (__glibc_unlikely (mode & RTLD_NODELETE)) - new->l_flags_1 |= DF_1_NODELETE; - #ifndef SHARED /* We must be the static _dl_open in libc.a. A static program that has loaded a dynamic object now has competition. */ |