diff options
| author | Florian Weimer <fweimer@redhat.com> | 2024-08-09 16:06:40 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2024-12-20 16:17:08 +0100 |
| commit | c4b160744cb39eca20dc36b39c7fa6e10352706c (patch) | |
| tree | 1e882aa42eda3bda6909d8d3e11838d4c6f0b7e9 /elf/tst-audit23.c | |
| parent | 8f36b1469677afe37168f9af1b77402d7a70c673 (diff) | |
| download | glibc-c4b160744cb39eca20dc36b39c7fa6e10352706c.tar.xz glibc-c4b160744cb39eca20dc36b39c7fa6e10352706c.zip | |
elf: Call la_objclose for proxy link maps in _dl_fini (bug 32065)
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf/tst-audit23.c')
| -rw-r--r-- | elf/tst-audit23.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/elf/tst-audit23.c b/elf/tst-audit23.c index c8c6553b8f..583c45f38a 100644 --- a/elf/tst-audit23.c +++ b/elf/tst-audit23.c @@ -236,13 +236,26 @@ do_test (int argc, char *argv[]) } } + Lmid_t lmid_other = LM_ID_NEWLM; + unsigned int other_namespace_count = 0; for (size_t i = 0; i < nobjs; i++) { - /* This subtest currently does not pass because of bug 32065. */ - if (! (endswith (objs[i].lname, LD_SO) && objs[i].lmid != LM_ID_BASE)) - TEST_COMPARE (objs[i].closed, true); + if (objs[i].lmid != LM_ID_BASE) + { + if (lmid_other == LM_ID_NEWLM) + lmid_other = objs[i].lmid; + TEST_COMPARE (objs[i].lmid, lmid_other); + ++other_namespace_count; + if (!(endswith (objs[i].lname, "/" LIBC_SO) + || endswith (objs[i].lname, "/" LD_SO))) + FAIL ("unexpected object in secondary namespace: %s", + objs[i].lname); + } + TEST_COMPARE (objs[i].closed, true); free (objs[i].lname); } + /* Both libc.so and ld.so should be present. */ + TEST_COMPARE (other_namespace_count, 2); /* la_activity(LA_ACT_CONSISTENT) should be the last callback received. Since only one link map may be not-CONSISTENT at a time, this also |