diff options
| author | Florian Weimer <fweimer@redhat.com> | 2023-07-07 10:11:26 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2023-07-07 11:14:39 +0200 |
| commit | c36912f08335ce28ccff963a60853a4035273b34 (patch) | |
| tree | a72ac729b4b49abede9f67d1379f72059ffb7c46 | |
| parent | 735cc668131e830d6d61820e06999505f29ed25c (diff) | |
| download | glibc-c36912f08335ce28ccff963a60853a4035273b34.tar glibc-c36912f08335ce28ccff963a60853a4035273b34.tar.gz glibc-c36912f08335ce28ccff963a60853a4035273b34.tar.bz2 glibc-c36912f08335ce28ccff963a60853a4035273b34.zip | |
elf: _dl_find_object may return 1 during early startup (bug 30515)
Success is reported with a 0 return value, and failure is -1.
Enhance the kitchen sink test elf/tst-audit28 to cover
_dl_find_object as well.
Fixes commit 5d28a8962dcb ("elf: Add _dl_find_object function")
and bug 30515.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
(cherry picked from commit 1bcfe0f732066ae5336b252295591ebe7e51c301)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | elf/dl-find_object.c | 2 | ||||
| -rw-r--r-- | elf/tst-auditmod28.c | 11 |
3 files changed, 13 insertions, 1 deletions
@@ -63,6 +63,7 @@ The following bugs are resolved with this release: [30163] posix: Fix system blocks SIGCHLD erroneously [30305] x86_64: Fix asm constraints in feraiseexcept [30477] libc: [RISCV]: time64 does not work on riscv32 + [30515] _dl_find_object incorrectly returns 1 during early startup Version 2.36 diff --git a/elf/dl-find_object.c b/elf/dl-find_object.c index 4d5831b6f4..2e5b456c11 100644 --- a/elf/dl-find_object.c +++ b/elf/dl-find_object.c @@ -46,7 +46,7 @@ _dl_find_object_slow (void *pc, struct dl_find_object *result) struct dl_find_object_internal internal; _dl_find_object_from_map (l, &internal); _dl_find_object_to_external (&internal, result); - return 1; + return 0; } /* Object not found. */ diff --git a/elf/tst-auditmod28.c b/elf/tst-auditmod28.c index db7ba95abe..9e0a122c38 100644 --- a/elf/tst-auditmod28.c +++ b/elf/tst-auditmod28.c @@ -71,6 +71,17 @@ la_version (unsigned int current) TEST_VERIFY (dladdr1 (&_exit, &info, &extra_info, RTLD_DL_LINKMAP) != 0); TEST_VERIFY (extra_info == handle); + /* Check _dl_find_object. */ + struct dl_find_object dlfo; + TEST_COMPARE (_dl_find_object (__builtin_return_address (0), &dlfo), 0); + /* "ld.so" is seen with --enable-hardcoded-path-in-tests. */ + if (strcmp (basename (dlfo.dlfo_link_map->l_name), "ld.so") != 0) + TEST_COMPARE_STRING (basename (dlfo.dlfo_link_map->l_name), LD_SO); + TEST_COMPARE (_dl_find_object (dlsym (handle, "environ"), &dlfo), 0); + TEST_COMPARE_STRING (basename (dlfo.dlfo_link_map->l_name), LIBC_SO); + TEST_COMPARE (_dl_find_object ((void *) 1, &dlfo), -1); + TEST_COMPARE (_dl_find_object ((void *) -1, &dlfo), -1); + /* Verify that dlmopen creates a new namespace. */ void *dlmopen_handle = xdlmopen (LM_ID_NEWLM, LIBC_SO, RTLD_NOW); TEST_VERIFY (dlmopen_handle != handle); |