public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/ld-audit-fixes-v4] elf: Add _dl_audit_objsearch
@ 2021-11-08 18:40 Adhemerval Zanella
0 siblings, 0 replies; 2+ messages in thread
From: Adhemerval Zanella @ 2021-11-08 18:40 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f4019416be3c66e2d6e15b1dc8619debb8de339d
commit f4019416be3c66e2d6e15b1dc8619debb8de339d
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue Jul 20 13:47:36 2021 -0300
elf: Add _dl_audit_objsearch
It consolidates the code required to call la_objsearch() audit
callback.
Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu.
Diff:
---
elf/dl-audit.c | 37 ++++++++++++++++++++++++++++
elf/dl-load.c | 61 ++++------------------------------------------
sysdeps/generic/ldsodefs.h | 2 ++
3 files changed, 44 insertions(+), 56 deletions(-)
diff --git a/elf/dl-audit.c b/elf/dl-audit.c
index 5fbc76a36c..de85ef1ddd 100644
--- a/elf/dl-audit.c
+++ b/elf/dl-audit.c
@@ -42,6 +42,43 @@ _dl_audit_activity_nsid (Lmid_t nsid, int action)
_dl_audit_activity_map (head, action);
}
+bool
+_dl_audit_objsearch (const char **name, const char **origname,
+ struct link_map *l, unsigned int code)
+{
+ if (__glibc_likely (GLRO(dl_naudit) == 0)
+ || l == NULL || l->l_auditing
+ || code == 0)
+ return true;
+
+ struct audit_ifaces *afct = GLRO(dl_audit);
+ for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
+ {
+ if (afct->objsearch != NULL)
+ {
+ const char *before = *name;
+ struct auditstate *state = link_map_audit_state (l, cnt);
+ *name = afct->objsearch (*name, &state->cookie, code);
+ if (*name == NULL)
+ return false;
+
+ if (origname != NULL && 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;
+ }
+
+ return true;
+}
+
void
_dl_audit_objopen (struct link_map *l, Lmid_t nsid, bool check_audit)
{
diff --git a/elf/dl-load.c b/elf/dl-load.c
index be9880f131..4a0ff9d010 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1600,33 +1600,8 @@ 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)
- {
- 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;
- }
-
- 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;
- }
- }
+ if (!_dl_audit_objsearch (&name, NULL, loader, whatcode))
+ return -1;
#endif
if (fd == -1)
@@ -2064,36 +2039,10 @@ _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 (!_dl_audit_objsearch (&name, &origname, loader, LA_SER_ORIG))
{
- struct audit_ifaces *afct = GLRO(dl_audit);
- for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
- {
- 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;
}
#endif
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index ea481cbe84..b1c76361d2 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -1392,6 +1392,8 @@ link_map_audit_state (struct link_map *l, size_t index)
}
}
+bool _dl_audit_objsearch (const char **name, const char **origname,
+ struct link_map *l, unsigned int code);
/* 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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [glibc/azanella/ld-audit-fixes-v4] elf: Add _dl_audit_objsearch
@ 2021-10-13 19:27 Adhemerval Zanella
0 siblings, 0 replies; 2+ messages in thread
From: Adhemerval Zanella @ 2021-10-13 19:27 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=83f0e637ef9ca83d6b8c26334ac2bc161104929c
commit 83f0e637ef9ca83d6b8c26334ac2bc161104929c
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue Jul 20 13:47:36 2021 -0300
elf: Add _dl_audit_objsearch
It consolidates the code required to call la_objsearch() audit
callback.
Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu.
Diff:
---
elf/dl-audit.c | 37 ++++++++++++++++++++++++++++
elf/dl-load.c | 61 ++++------------------------------------------
sysdeps/generic/ldsodefs.h | 2 ++
3 files changed, 44 insertions(+), 56 deletions(-)
diff --git a/elf/dl-audit.c b/elf/dl-audit.c
index 5fbc76a36c..de85ef1ddd 100644
--- a/elf/dl-audit.c
+++ b/elf/dl-audit.c
@@ -42,6 +42,43 @@ _dl_audit_activity_nsid (Lmid_t nsid, int action)
_dl_audit_activity_map (head, action);
}
+bool
+_dl_audit_objsearch (const char **name, const char **origname,
+ struct link_map *l, unsigned int code)
+{
+ if (__glibc_likely (GLRO(dl_naudit) == 0)
+ || l == NULL || l->l_auditing
+ || code == 0)
+ return true;
+
+ struct audit_ifaces *afct = GLRO(dl_audit);
+ for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
+ {
+ if (afct->objsearch != NULL)
+ {
+ const char *before = *name;
+ struct auditstate *state = link_map_audit_state (l, cnt);
+ *name = afct->objsearch (*name, &state->cookie, code);
+ if (*name == NULL)
+ return false;
+
+ if (origname != NULL && 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;
+ }
+
+ return true;
+}
+
void
_dl_audit_objopen (struct link_map *l, Lmid_t nsid, bool check_audit)
{
diff --git a/elf/dl-load.c b/elf/dl-load.c
index dad7654f94..90de8e0061 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1598,33 +1598,8 @@ 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)
- {
- 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;
- }
-
- 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;
- }
- }
+ if (!_dl_audit_objsearch (&name, NULL, loader, whatcode))
+ return -1;
#endif
if (fd == -1)
@@ -2062,36 +2037,10 @@ _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 (!_dl_audit_objsearch (&name, &origname, loader, LA_SER_ORIG))
{
- struct audit_ifaces *afct = GLRO(dl_audit);
- for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
- {
- 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;
}
#endif
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 1237d1a38b..17378339e7 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -1361,6 +1361,8 @@ link_map_audit_state (struct link_map *l, size_t index)
}
}
+bool _dl_audit_objsearch (const char **name, const char **origname,
+ struct link_map *l, unsigned int code);
/* 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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-08 18:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-08 18:40 [glibc/azanella/ld-audit-fixes-v4] elf: Add _dl_audit_objsearch Adhemerval Zanella
-- strict thread matches above, loose matches on Subject: below --
2021-10-13 19:27 Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).