AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-03 18:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

elf: Add _dl_audit_objsearch

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

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

Reviewed-by: Florian Weimer <fweimer@redhat.com>
(cherry picked from commit c91008d349)
This commit is contained in:
Adhemerval Zanella 2021-07-20 13:47:36 -03:00 committed by Carlos O'Donell
parent 66e9d27a09
commit ec0fc2a153
3 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
elf/dl-audit.c
View File

@ -44,6 +44,28 @@ _dl_audit_activity_nsid (Lmid_t nsid, int action)
_dl_audit_activity_map (head, action);
}
const char *
_dl_audit_objsearch (const char *name, struct link_map *l, unsigned int code)
{
if (l == NULL || l->l_auditing || code == 0)
return name;
struct audit_ifaces *afct = GLRO(dl_audit);
for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
{
if (afct->objsearch != NULL)
{
struct auditstate *state = link_map_audit_state (l, cnt);
name = afct->objsearch (name, &state->cookie, code);
if (name == NULL)
return NULL;
}
afct = afct->next;
}
return name;
}
void
_dl_audit_objopen (struct link_map *l, Lmid_t nsid)
{

67
elf/dl-load.c
View File

@ -1596,32 +1596,20 @@ open_verify (const char *name, int fd,
#ifdef SHARED
/* Give the auditing libraries a chance. */
if (__glibc_unlikely (GLRO(dl_naudit) > 0) && whatcode != 0
&& loader->l_auditing == 0)
if (__glibc_unlikely (GLRO(dl_naudit) > 0))
{
const char *original_name = name;
struct audit_ifaces *afct = GLRO(dl_audit);
for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
{
if (afct->objsearch != NULL)
{
struct auditstate *state = link_map_audit_state (loader, cnt);
name = afct->objsearch (name, &state->cookie, whatcode);
if (name == NULL)
/* Ignore the path. */
return -1;
}
afct = afct->next;
}
name = _dl_audit_objsearch (name, loader, whatcode);
if (name == NULL)
return -1;
if (fd != -1 && name != original_name && strcmp (name, original_name))
{
/* An audit library changed what we're supposed to open,
so FD no longer matches it. */
__close_nocancel (fd);
fd = -1;
}
{
/* An audit library changed what we're supposed to open,
so FD no longer matches it. */
__close_nocancel (fd);
fd = -1;
}
}
#endif
@ -2060,36 +2048,17 @@ _dl_map_object (struct link_map *loader, const char *name,
#ifdef SHARED
/* Give the auditing libraries a chance to change the name before we
try anything. */
if (__glibc_unlikely (GLRO(dl_naudit) > 0)
&& (loader == NULL || loader->l_auditing == 0))
if (__glibc_unlikely (GLRO(dl_naudit) > 0))
{
struct audit_ifaces *afct = GLRO(dl_audit);
for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
const char *before = name;
name = _dl_audit_objsearch (name, loader, LA_SER_ORIG);
if (name == NULL)
{
if (afct->objsearch != NULL)
{
const char *before = name;
struct auditstate *state = link_map_audit_state (loader, cnt);
name = afct->objsearch (name, &state->cookie, LA_SER_ORIG);
if (name == NULL)
{
/* Do not try anything further. */
fd = -1;
goto no_file;
}
if (before != name && strcmp (before, name) != 0)
{
if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_FILES))
_dl_debug_printf ("audit changed filename %s -> %s\n",
before, name);
if (origname == NULL)
origname = before;
}
}
afct = afct->next;
fd = -1;
goto no_file;
}
if (before != name && strcmp (before, name) != 0)
origname = before;
}
#endif

7
sysdeps/generic/ldsodefs.h
View File

@ -1361,6 +1361,13 @@ link_map_audit_state (struct link_map *l, size_t index)
}
}
/* Call the la_objsearch from the audit modules from the link map L. If
ORIGNAME is non NULL, it is updated with the revious name prior calling
la_objsearch. */
const char *_dl_audit_objsearch (const char *name, struct link_map *l,
unsigned int code)
attribute_hidden;
/* Call the la_activity from the audit modules from the link map L and issues
the ACTION argument. */
void _dl_audit_activity_map (struct link_map *l, int action)