summary refs log tree commit diff
path: root/elf/dl-close.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-01-09 08:29:25 +0000
committerUlrich Drepper <drepper@redhat.com>2005-01-09 08:29:25 +0000
commit29f976542bf6589ebad2ee60b855e01ad3c33016 (patch)
tree6e85fd0dc26fca9984a42fb603efa41403b20b35 /elf/dl-close.c
parent4e2d549137c8e9990f446fee58ad78a1c6495fa9 (diff)
downloadglibc-29f976542bf6589ebad2ee60b855e01ad3c33016.tar.gz
glibc-29f976542bf6589ebad2ee60b855e01ad3c33016.tar.xz
glibc-29f976542bf6589ebad2ee60b855e01ad3c33016.zip
Update.
2005-01-09  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-debug.c (_dl_debug_initialize): Take extra parameter and
	use it to select the r_debug structure for that namespace.
	* elf/dl-close.c (_dl_close): Adjust call to _dl_debug_initialize.
	* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
	* elf/dl-open.c (_dl_open): Likewise.
	* elf/rtld.c (dl_main): Likewise.
	* sysdeps/generic/ldsodefs.h (struct link_namespaces): Add _ns_debug
	member.
	(_dl_debug_initialize): Add new parameter in declaration.

	* elf/dl-close.c (_dl_close): Make sure auditing callbacks are not
	called for the auditing objects themselves.
	* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
Diffstat (limited to 'elf/dl-close.c')
-rw-r--r--elf/dl-close.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/elf/dl-close.c b/elf/dl-close.c
index cf926ae566..eb5e805dd4 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -1,5 +1,5 @@
 /* Close a shared object opened by `_dl_open'.
-   Copyright (C) 1996-2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1996-2002, 2003, 2004, 2005 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
@@ -266,6 +266,9 @@ _dl_close (void *_map)
   assert (new_opencount[0] == 0);
 
   /* Call all termination functions at once.  */
+#ifdef SHARED
+  bool do_audit = GLRO(dl_naudit) > 0 && !GL(dl_ns)[ns]._ns_loaded->l_auditing;
+#endif
   for (i = 0; list[i] != NULL; ++i)
     {
       struct link_map *imap = list[i];
@@ -306,7 +309,7 @@ _dl_close (void *_map)
 
 #ifdef SHARED
 	  /* Auditing checkpoint: we have a new object.  */
-	  if (__builtin_expect (GLRO(dl_naudit) > 0, 0))
+	  if (__builtin_expect (do_audit, 0))
 	    {
 	      struct audit_ifaces *afct = GLRO(dl_audit);
 	      for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
@@ -388,7 +391,7 @@ _dl_close (void *_map)
 
 #ifdef SHARED
   /* Auditing checkpoint: we will start deleting objects.  */
-  if (__builtin_expect (GLRO(dl_naudit) > 0, 0))
+  if (__builtin_expect (do_audit, 0))
     {
       struct link_map *head = GL(dl_ns)[ns]._ns_loaded;
       struct audit_ifaces *afct = GLRO(dl_audit);
@@ -407,7 +410,7 @@ _dl_close (void *_map)
 #endif
 
   /* Notify the debugger we are about to remove some loaded objects.  */
-  struct r_debug *r = _dl_debug_initialize (0);
+  struct r_debug *r = _dl_debug_initialize (0, ns);
   r->r_state = RT_DELETE;
   _dl_debug_state ();
 
@@ -629,7 +632,7 @@ _dl_close (void *_map)
 
 #ifdef SHARED
   /* Auditing checkpoint: we have deleted all objects.  */
-  if (__builtin_expect (GLRO(dl_naudit) > 0, 0))
+  if (__builtin_expect (do_audit, 0))
     {
       struct link_map *head = GL(dl_ns)[ns]._ns_loaded;
       /* Do not call the functions for any auditing object.  */