lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Set NODELETE flag when opening already open objects with RTLD_NODELETE

Browse Source 
The DF_1_NODELETE flag is set too late when opening a DSO, due to
which, if a DSO is already open, subsequently opening it with
RTLD_NODELETE fails to set the DF_1_NODELETE flag.  This patch fixes
this by setting the flag immediately after bumping the opencount.

Verified on x86_64.

	[BZ #18676]
	* elf/tst-nodelete-opened.c: New test case.
	* elf/tst-nodelete-opened-lib.c: New test case module.
	* elf/Makefile (tests, modules-names): Use them.
	* elf/dl-open.c (dl_open_worker): Set DF_1_NODELETE flag
	early.
This commit is contained in:
Siddhesh Poyarekar
2015-07-16 08:53:28 +05:30
parent c59f721c73
commit b632bdd3f7
6 changed files with 106 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
elf/dl-open.c
View File

@ -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. */