diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-01-09 08:29:25 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-01-09 08:29:25 +0000 |
| commit | 29f976542bf6589ebad2ee60b855e01ad3c33016 (patch) | |
| tree | 6e85fd0dc26fca9984a42fb603efa41403b20b35 /elf/dl-load.c | |
| parent | 4e2d549137c8e9990f446fee58ad78a1c6495fa9 (diff) | |
| download | glibc-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-load.c')
| -rw-r--r-- | elf/dl-load.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index 7f11b62bf4..363f77bcdf 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1,5 +1,5 @@ /* Map in a shared object's segments from the file. - Copyright (C) 1995-2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1995-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 @@ -827,7 +827,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, /* Initialize to keep the compiler happy. */ const char *errstring = NULL; int errval = 0; - struct r_debug *r = _dl_debug_initialize (0); + struct r_debug *r = _dl_debug_initialize (0, nsid); bool make_consistent = false; /* Get file information. */ @@ -1467,7 +1467,8 @@ cannot enable executable stack as shared object requires"); #ifdef SHARED /* Auditing checkpoint: we have a new object. */ - if (__builtin_expect (GLRO(dl_naudit) > 0, 0)) + if (__builtin_expect (GLRO(dl_naudit) > 0, 0) + && !GL(dl_ns)[l->l_ns]._ns_loaded->l_auditing) { struct audit_ifaces *afct = GLRO(dl_audit); for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) |