Update copyright dates with scripts/update-copyrights

[thirdparty/glibc.git] / elf / dl-fini.c

diff --git a/elf/dl-fini.c b/elf/dl-fini.c
index 8421c4fab849dae40c10be187e29eb965e1e9bdb..db996270de65e86a63e4f6500081b66e07bae914 100644 (file)
--- a/elf/dl-fini.c
+++ b/elf/dl-fini.c
@@ -1,5 +1,5 @@
 /* Call the termination functions of loaded shared objects.
-   Copyright (C) 1995-2017 Free Software Foundation, Inc.
+   Copyright (C) 1995-2024 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -14,16 +14,12 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <assert.h>
 #include <string.h>
 #include <ldsodefs.h>
-
-
-/* Type of the constructor functions.  */
-typedef void (*fini_t) (void);
-
+#include <elf-initfini.h>
 
 void
 _dl_fini (void)
@@ -63,6 +59,10 @@ _dl_fini (void)
        __rtld_lock_unlock_recursive (GL(dl_load_lock));
       else
        {
+#ifdef SHARED
+         _dl_audit_activity_nsid (ns, LA_ACT_DELETE);
+#endif
+
          /* Now we can allocate an array to hold all the pointers and
             copy the pointers in.  */
          struct link_map *maps[nloaded];
@@ -91,8 +91,7 @@ _dl_fini (void)
          /* Now we have to do the sorting.  We can skip looking for the
             binary itself which is at the front of the search list for
             the main namespace.  */
-         _dl_sort_maps (maps + (ns == LM_ID_BASE), nmaps - (ns == LM_ID_BASE),
-                        NULL, true);
+         _dl_sort_maps (maps, nmaps, (ns == LM_ID_BASE), true);
 
          /* We do not rely on the linked list of loaded object anymore
             from this point on.  We have our own list here (maps).  The
@@ -112,58 +111,20 @@ _dl_fini (void)
 
              if (l->l_init_called)
                {
-                 /* Make sure nothing happens if we are called twice.  */
-                 l->l_init_called = 0;
-
-                 /* Is there a destructor function?  */
-                 if (l->l_info[DT_FINI_ARRAY] != NULL
-                     || l->l_info[DT_FINI] != NULL)
-                   {
-                     /* When debugging print a message first.  */
-                     if (__builtin_expect (GLRO(dl_debug_mask)
-                                           & DL_DEBUG_IMPCALLS, 0))
-                       _dl_debug_printf ("\ncalling fini: %s [%lu]\n\n",
-                                         DSO_FILENAME (l->l_name),
-                                         ns);
-
-                     /* First see whether an array is given.  */
-                     if (l->l_info[DT_FINI_ARRAY] != NULL)
-                       {
-                         ElfW(Addr) *array =
-                           (ElfW(Addr) *) (l->l_addr
-                                           + l->l_info[DT_FINI_ARRAY]->d_un.d_ptr);
-                         unsigned int i = (l->l_info[DT_FINI_ARRAYSZ]->d_un.d_val
-                                           / sizeof (ElfW(Addr)));
-                         while (i-- > 0)
-                           ((fini_t) array[i]) ();
-                       }
-
-                     /* Next try the old-style destructor.  */
-                     if (l->l_info[DT_FINI] != NULL)
-                       DL_CALL_DT_FINI
-                         (l, l->l_addr + l->l_info[DT_FINI]->d_un.d_ptr);
-                   }
-
+                 _dl_call_fini (l);
 #ifdef SHARED
                  /* Auditing checkpoint: another object closed.  */
-                 if (!do_audit && __builtin_expect (GLRO(dl_naudit) > 0, 0))
-                   {
-                     struct audit_ifaces *afct = GLRO(dl_audit);
-                     for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
-                       {
-                         if (afct->objclose != NULL)
-                           /* Return value is ignored.  */
-                           (void) afct->objclose (&l->l_audit[cnt].cookie);
-
-                         afct = afct->next;
-                       }
-                   }
+                 _dl_audit_objclose (l);
 #endif
                }
 
              /* Correct the previous increment.  */
              --l->l_direct_opencount;
            }
+
+#ifdef SHARED
+         _dl_audit_activity_nsid (ns, LA_ACT_CONSISTENT);
+#endif
        }
     }