7729eb
commit 79528414dc1578800cbf1fba2fbdb6335f4f39bf
7729eb
Author: H.J. Lu <hjl.tools@gmail.com>
7729eb
Date:   Thu Sep 30 10:29:17 2021 -0700
7729eb
7729eb
    elf: Replace nsid with args.nsid [BZ #27609]
7729eb
    
7729eb
    commit ec935dea6332cb22f9881cd1162bad156173f4b0
7729eb
    Author: Florian Weimer <fweimer@redhat.com>
7729eb
    Date:   Fri Apr 24 22:31:15 2020 +0200
7729eb
    
7729eb
        elf: Implement __libc_early_init
7729eb
    
7729eb
    has
7729eb
    
7729eb
    @@ -856,6 +876,11 @@ no more namespaces available for dlmopen()"));
7729eb
       /* See if an error occurred during loading.  */
7729eb
       if (__glibc_unlikely (exception.errstring != NULL))
7729eb
         {
7729eb
    +      /* Avoid keeping around a dangling reference to the libc.so link
7729eb
    +   map in case it has been cached in libc_map.  */
7729eb
    +      if (!args.libc_already_loaded)
7729eb
    +  GL(dl_ns)[nsid].libc_map = NULL;
7729eb
    +
7729eb
    
7729eb
    do_dlopen calls _dl_open with nsid == __LM_ID_CALLER (-2), which calls
7729eb
    dl_open_worker with args.nsid = nsid.  dl_open_worker updates args.nsid
7729eb
    if it is __LM_ID_CALLER.  After dl_open_worker returns, it is wrong to
7729eb
    use nsid.
7729eb
    
7729eb
    Replace nsid with args.nsid after dl_open_worker returns.  This fixes
7729eb
    BZ #27609.
7729eb
    
7729eb
    (cherry picked from commit 1e1ecea62e899acb58c3fdf3b320a0833ddd0dff)
7729eb
7729eb
diff --git a/elf/dl-open.c b/elf/dl-open.c
7729eb
index ec386626f96e17f7..41c7250bf630f978 100644
7729eb
--- a/elf/dl-open.c
7729eb
+++ b/elf/dl-open.c
7729eb
@@ -886,7 +886,7 @@ no more namespaces available for dlmopen()"));
7729eb
       /* Avoid keeping around a dangling reference to the libc.so link
7729eb
 	 map in case it has been cached in libc_map.  */
7729eb
       if (!args.libc_already_loaded)
7729eb
-	GL(dl_ns)[nsid].libc_map = NULL;
7729eb
+	GL(dl_ns)[args.nsid].libc_map = NULL;
7729eb
 
7729eb
       /* Remove the object from memory.  It may be in an inconsistent
7729eb
 	 state if relocation failed, for example.  */