AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix getting return address in elf/tst-audit28.c.

Browse Source 
Starting with commit 1bcfe0f732, the
test was enhanced and the object for __builtin_return_address (0)
is searched with _dl_find_object.

Unfortunately on e.g. s390 (31bit), a postprocessing step is needed
as the highest bit has to be masked out.  This can be done with
__builtin_extract_return_addr.

Without this postprocessing, _dl_find_object returns with -1 and the
content of dlfo is invalid, which may lead to segfaults in basename.
Therefore those checks are now only done on success.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
This commit is contained in:
Stefan Liebler 2023-07-13 15:13:48 +02:00
parent 8b9a0af8ca
commit 5d72e7e41a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
elf/tst-auditmod28.c
View File

@ -73,12 +73,19 @@ la_version (unsigned int current)
/* 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);
void *ret_addr = __builtin_extract_return_addr (__builtin_return_address (0));
int ret_dl_find_object =_dl_find_object (ret_addr, &dlfo);
TEST_COMPARE (ret_dl_find_object, 0);
if (ret_dl_find_object == 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);
}
ret_dl_find_object = _dl_find_object (dlsym (handle, "environ"), &dlfo);
TEST_COMPARE (ret_dl_find_object, 0);
if (ret_dl_find_object == 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);