From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 9D4193850404; Fri, 7 Jul 2023 09:40:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9D4193850404 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1688722810; bh=121C0Xgo2iqpN0vuK4U65ikx1gTWkvGNmuthlolIwDc=; h=From:To:Subject:Date:From; b=H42sRa0j1m5C5Rr6Su0LTtktFS/cegZEDdIgnk6CCaLR8v6FeCZp+NS5S0d8M38W3 cTyMx/gxRZbqCMH+nOfQhIi1xh7yOpNhFA5izVAazLq390F/kINHDQlQmeg8RZkwqP cqxLvrGUY7aunBKuBWI6viw5A/6jNKaDWyvVix0s= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.36/master] elf: _dl_find_object may return 1 during early startup (bug 30515) X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.36/master X-Git-Oldrev: 735cc668131e830d6d61820e06999505f29ed25c X-Git-Newrev: c36912f08335ce28ccff963a60853a4035273b34 Message-Id: <20230707094010.9D4193850404@sourceware.org> Date: Fri, 7 Jul 2023 09:40:10 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c36912f08335ce28ccff963a60853a4035273b34 commit c36912f08335ce28ccff963a60853a4035273b34 Author: Florian Weimer Date: Fri Jul 7 10:11:26 2023 +0200 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 Tested-by: Carlos O'Donell (cherry picked from commit 1bcfe0f732066ae5336b252295591ebe7e51c301) Diff: --- NEWS | 1 + elf/dl-find_object.c | 2 +- elf/tst-auditmod28.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 9f6b48b63d..82e868d73b 100644 --- a/NEWS +++ b/NEWS @@ -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);