diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-06-30 17:33:57 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-12-28 08:40:38 -0300 |
| commit | 484e672ddabe0a919a692520e6ac8f2580866235 (patch) | |
| tree | 0496dbb8d7b53ca97a04cc4f81219445409807fe /elf/Makefile | |
| parent | f0e23d34a7bdf6b90fba954ee741419171ac41b2 (diff) | |
| download | glibc-484e672ddabe0a919a692520e6ac8f2580866235.tar.gz glibc-484e672ddabe0a919a692520e6ac8f2580866235.tar.xz glibc-484e672ddabe0a919a692520e6ac8f2580866235.zip | |
elf: Do not fail for failed dlmopen on audit modules (BZ #28061)
The dl_main sets the LM_ID_BASE to RT_ADD just before starting to add load new shared objects. The state is set to RT_CONSISTENT just after all objects are loaded. However if a audit modules tries to dlmopen an inexistent module, the _dl_open will assert that the namespace is in an inconsistent state. This is different than dlopen, since first it will not use LM_ID_BASE and second _dl_map_object_from_fd is the sole responsible to set and reset the r_state value. So the assert on _dl_open can not really be seen if the state is consistent, since _dt_main resets it. This patch removes the assert. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/elf/Makefile b/elf/Makefile index f427e2d6a3..d920586701 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -232,6 +232,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-dl-is_dso tst-ro-dynamic \ tst-audit18 \ tst-audit19b \ + tst-audit20 \ tst-audit22 \ tst-rtld-run-static \ # reldep9 @@ -383,6 +384,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-auditmod19a \ tst-auditmod19b \ tst-audit19bmod \ + tst-auditmod20 \ tst-auditmod22 \ # Most modules build with _ISOMAC defined, but those filtered out @@ -1596,6 +1598,9 @@ $(objpfx)tst-audit19b.out: $(objpfx)tst-auditmod19b.so $(objpfx)tst-audit19b: $(objpfx)tst-audit19bmod.so tst-audit19b-ARGS = -- $(host-test-program-cmd) +$(objpfx)tst-audit20.out: $(objpfx)tst-auditmod20.so +tst-audit20-ENV = LD_AUDIT=$(objpfx)tst-auditmod20.so + $(objpfx)tst-audit22.out: $(objpfx)tst-auditmod22.so tst-audit22-ARGS = -- $(host-test-program-cmd) |