mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-27 04:41:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

elf: _dl_find_object may return 1 during early startup (bug 30515)

Browse Source 
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 5d28a8962d ("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 1bcfe0f732)
This commit is contained in:
Florian Weimer 2023-07-07 10:11:26 +02:00
parent 735cc66813
commit c36912f083
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -63,6 +63,7 @@ The following bugs are resolved with this release:
[30163] posix: Fix system blocks SIGCHLD erroneously [30163] posix: Fix system blocks SIGCHLD erroneously
[30305] x86_64: Fix asm constraints in feraiseexcept [30305] x86_64: Fix asm constraints in feraiseexcept
[30477] libc: [RISCV]: time64 does not work on riscv32 [30477] libc: [RISCV]: time64 does not work on riscv32
[30515] _dl_find_object incorrectly returns 1 during early startup
Version 2.36 Version 2.36

2
elf/dl-find_object.c
View File

@ -46,7 +46,7 @@ _dl_find_object_slow (void *pc, struct dl_find_object *result)
struct dl_find_object_internal internal; struct dl_find_object_internal internal;
_dl_find_object_from_map (l, &internal); _dl_find_object_from_map (l, &internal);
_dl_find_object_to_external (&internal, result); _dl_find_object_to_external (&internal, result);
return 1; return 0;
} }
/* Object not found. */ /* Object not found. */

11
elf/tst-auditmod28.c
View File

@ -71,6 +71,17 @@ la_version (unsigned int current)
TEST_VERIFY (dladdr1 (&_exit, &info, &extra_info, RTLD_DL_LINKMAP) != 0); TEST_VERIFY (dladdr1 (&_exit, &info, &extra_info, RTLD_DL_LINKMAP) != 0);
TEST_VERIFY (extra_info == handle); 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. */ /* Verify that dlmopen creates a new namespace. */
void *dlmopen_handle = xdlmopen (LM_ID_NEWLM, LIBC_SO, RTLD_NOW); void *dlmopen_handle = xdlmopen (LM_ID_NEWLM, LIBC_SO, RTLD_NOW);
TEST_VERIFY (dlmopen_handle != handle); TEST_VERIFY (dlmopen_handle != handle);