[PATCH] Load audit modules in context of main map

[PATCH] Load audit modules in context of main map

[Andreas Schwab]

2010-12-15  Andreas Schwab  <schwab@redhat.com>

	* elf/dl-open.c (dl_open_worker): Always use main map for audit
	modules.
---
 elf/dl-open.c |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/elf/dl-open.c b/elf/dl-open.c
index cf8e8cc..89d31d7 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -193,18 +193,21 @@ dl_open_worker (void *a)
 	 By default we assume this is the main application.  */
       call_map = GL(dl_ns)[LM_ID_BASE]._ns_loaded;
 
-      struct link_map *l;
-      for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
-	for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
-	  if (caller_dlopen >= (const void *) l->l_map_start
-	      && caller_dlopen < (const void *) l->l_map_end
-	      && (l->l_contiguous
-		  || _dl_addr_inside_object (l, (ElfW(Addr)) caller_dlopen)))
-	    {
-	      assert (ns == l->l_ns);
-	      call_map = l;
-	      goto found_caller;
-	    }
+      if ((mode & __RTLD_AUDIT) == 0)
+	{
+	  struct link_map *l;
+	  for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
+	    for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
+	      if (caller_dlopen >= (const void *) l->l_map_start
+		  && caller_dlopen < (const void *) l->l_map_end
+		  && (l->l_contiguous
+		      || _dl_addr_inside_object (l, (ElfW(Addr)) caller_dlopen)))
+		{
+		  assert (ns == l->l_ns);
+		  call_map = l;
+		  goto found_caller;
+		}
+	}
 
     found_caller:
       if (args->nsid == __LM_ID_CALLER)
-- 
1.7.2.3


-- 
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."

Re: [PATCH] Load audit modules in context of main map

[Ulrich Drepper]

On Thu, Dec 16, 2010 at 03:42, Andreas Schwab <schwab@redhat.com> wrote:
> 2010-12-15  Andreas Schwab  <schwab@redhat.com>
>
>        * elf/dl-open.c (dl_open_worker): Always use main map for audit
>        modules.

What's the reason?  How can it happen in correct programs anyway?

Re: [PATCH] Load audit modules in context of main map

[Andreas Schwab]

Ulrich Drepper <drepper@gmail.com> writes:

> On Thu, Dec 16, 2010 at 03:42, Andreas Schwab <schwab@redhat.com> wrote:
>> 2010-12-15  Andreas Schwab  <schwab@redhat.com>
>>
>>        * elf/dl-open.c (dl_open_worker): Always use main map for audit
>>        modules.
>
> What's the reason?

$ LD_AUDIT=/\$LIB/foo cat
Inconsistency detected by ld.so: dl-load.c: 331: expand_dynamic_string_token: Assertion `(l)->l_name[0] == '\0'' failed!

Andreas.

-- 
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."

Re: [PATCH] Load audit modules in context of main map

[Ulrich Drepper]

On Mon, Jan 10, 2011 at 05:45, Andreas Schwab <schwab@redhat.com> wrote:
> $ LD_AUDIT=/\$LIB/foo cat
> Inconsistency detected by ld.so: dl-load.c: 331: expand_dynamic_string_token: Assertion `(l)->l_name[0] == '\0'' failed!

OK.  That's a problem but I fixed it differently.