about summary refs log tree commit diff
path: root/elf/tst-auditmod28.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2023-07-07 10:11:26 +0200
committerFlorian Weimer <fweimer@redhat.com>2023-07-07 10:11:26 +0200
commit1bcfe0f732066ae5336b252295591ebe7e51c301 (patch)
treedbdb5fc80df296b97b50fb008610905786e1072f /elf/tst-auditmod28.c
parent0567edf1b2def04840e38e3610452c51a3f440a3 (diff)
downloadglibc-1bcfe0f732066ae5336b252295591ebe7e51c301.tar.gz
glibc-1bcfe0f732066ae5336b252295591ebe7e51c301.tar.xz
glibc-1bcfe0f732066ae5336b252295591ebe7e51c301.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>
Diffstat (limited to 'elf/tst-auditmod28.c')
-rw-r--r--elf/tst-auditmod28.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/elf/tst-auditmod28.c b/elf/tst-auditmod28.c
index f6ab991398..f6dfbbe202 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);