lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

elf: Add _dl_audit_preinit

Browse Source 
It consolidates the code required to call la_preinit audit
callback.

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

Reviewed-by: Florian Weimer <fweimer@redhat.com>
This commit is contained in:
Adhemerval Zanella
2021-07-22 17:10:57 -03:00
parent cda4f265c6
commit 0b98a87487
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
csu/libc-start.c
View File

@@ -377,32 +377,15 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
/* This is a current program. Use the dynamic segment to find /* This is a current program. Use the dynamic segment to find
constructors. */ constructors. */
call_init (argc, argv, __environ); call_init (argc, argv, __environ);
#else /* !SHARED */
call_init (argc, argv, __environ);
#endif /* SHARED */
#ifdef SHARED
/* Auditing checkpoint: we have a new object. */ /* Auditing checkpoint: we have a new object. */
if (__glibc_unlikely (GLRO(dl_naudit) > 0)) _dl_audit_preinit (GL(dl_ns)[LM_ID_BASE]._ns_loaded);
{
struct audit_ifaces *afct = GLRO(dl_audit);
struct link_map *head = GL(dl_ns)[LM_ID_BASE]._ns_loaded;
for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
{
if (afct->preinit != NULL)
afct->preinit (&link_map_audit_state (head, cnt)->cookie);
afct = afct->next;
}
}
#endif
#ifdef SHARED
if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS)) if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS))
GLRO(dl_debug_printf) ("\ntransferring control: %s\n\n", argv[0]); GLRO(dl_debug_printf) ("\ntransferring control: %s\n\n", argv[0]);
#endif #else /* !SHARED */
call_init (argc, argv, __environ);
#ifndef SHARED
_dl_debug_initialize (0, LM_ID_BASE); _dl_debug_initialize (0, LM_ID_BASE);
#endif #endif

2
elf/Versions
View File

@@ -55,7 +55,7 @@ ld {
_dl_argv; _dl_find_dso_for_object; _dl_get_tls_static_info; _dl_argv; _dl_find_dso_for_object; _dl_get_tls_static_info;
_dl_deallocate_tls; _dl_make_stack_executable; _dl_deallocate_tls; _dl_make_stack_executable;
_dl_rtld_di_serinfo; _dl_starting_up; _dl_fatal_printf; _dl_rtld_di_serinfo; _dl_starting_up; _dl_fatal_printf;
_dl_audit_symbind_alt; _dl_audit_symbind_alt; _dl_audit_preinit;
_rtld_global; _rtld_global_ro; _rtld_global; _rtld_global_ro;
# Only here for gdb while a better method is developed. # Only here for gdb while a better method is developed.

15
elf/dl-audit.c
View File

@@ -108,6 +108,21 @@ _dl_audit_objclose (struct link_map *l)
} }
} }
void
_dl_audit_preinit (struct link_map *l)
{
if (__glibc_likely (GLRO(dl_naudit) == 0))
return;
struct audit_ifaces *afct = GLRO(dl_audit);
for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
{
if (afct->preinit != NULL)
afct->preinit (&link_map_audit_state (l, cnt)->cookie);
afct = afct->next;
}
}
void void
_dl_audit_symbind_alt (struct link_map *l, const ElfW(Sym) *ref, void **value, _dl_audit_symbind_alt (struct link_map *l, const ElfW(Sym) *ref, void **value,
lookup_t result) lookup_t result)

3
sysdeps/generic/ldsodefs.h
View File

@@ -1422,6 +1422,9 @@ void _dl_audit_objopen (struct link_map *l, Lmid_t nsid)
void _dl_audit_objclose (struct link_map *l) void _dl_audit_objclose (struct link_map *l)
attribute_hidden; attribute_hidden;
/* Call the la_preinit from the audit modules for the link_map L. */
void _dl_audit_preinit (struct link_map *l);
/* Call the la_symbind{32,64} from the audit modules for the link_map L. */ /* Call the la_symbind{32,64} from the audit modules for the link_map L. */
void _dl_audit_symbind (struct link_map *l, struct reloc_result *reloc_result, void _dl_audit_symbind (struct link_map *l, struct reloc_result *reloc_result,
const ElfW(Sym) *defsym, DL_FIXUP_VALUE_TYPE *value, const ElfW(Sym) *defsym, DL_FIXUP_VALUE_TYPE *value,