about summary refs log tree commit diff
path: root/elf/dl-load.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2021-07-20 11:03:34 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2021-12-28 08:40:38 -0300
commit3dac3959a5cb585b065cef2cb8a8d909c907e202 (patch)
tree7cafc3b94478fc6050c7a6db09f98bf4ac448f9d /elf/dl-load.c
parentaee6e90f93e285016b6cd9c8bd00402c19ba271b (diff)
downloadglibc-3dac3959a5cb585b065cef2cb8a8d909c907e202.tar.gz
glibc-3dac3959a5cb585b065cef2cb8a8d909c907e202.tar.xz
glibc-3dac3959a5cb585b065cef2cb8a8d909c907e202.zip
elf: Add _dl_audit_activity_map and _dl_audit_activity_nsid
It consolidates the code required to call la_activity audit
callback.

Also for a new Lmid_t the namespace link_map list are empty, so it
requires to check if before using it.  This can happen for when audit
module is used along with dlmopen.

Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diffstat (limited to 'elf/dl-load.c')
-rw-r--r--elf/dl-load.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 8d9df424b2..bd7dae8eac 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1483,24 +1483,8 @@ cannot enable executable stack as shared object requires");
       /* Auditing checkpoint: we are going to add new objects.  Since this
          is called after _dl_add_to_namespace_list the namespace is guaranteed
 	 to not be empty.  */
-      if ((mode & __RTLD_AUDIT) == 0
-	  && __glibc_unlikely (GLRO(dl_naudit) > 0))
-	{
-	  struct link_map *head = GL(dl_ns)[nsid]._ns_loaded;
-	  /* Do not call the functions for any auditing object.  */
-	  if (head->l_auditing == 0)
-	    {
-	      struct audit_ifaces *afct = GLRO(dl_audit);
-	      for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
-		{
-		  if (afct->activity != NULL)
-		    afct->activity (&link_map_audit_state (head, cnt)->cookie,
-				    LA_ACT_ADD);
-
-		  afct = afct->next;
-		}
-	    }
-	}
+      if ((mode & __RTLD_AUDIT) == 0)
+	_dl_audit_activity_nsid (nsid, LA_ACT_ADD);
 #endif
 
       /* Notify the debugger we have added some objects.  We need to