From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1962) id 641183858C66; Wed, 19 Jul 2023 11:19:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 641183858C66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689765561; bh=4YBzJ8MK7SCRYaqCYMPlltMyAfuAmomdemWwHv+aOXw=; h=From:To:Subject:Date:From; b=UCHTAkFxt2KswizpXUvXRRG9BEFPpubD2XqyL2VQt0xxXmG1Mkz7CuPX71APDJVR3 BrWYgciH2rFhTjpnfBUYGfFAy/AX6ZrPEGwHmvR2AuZ29KLCqYo0FTnBb8+q8WwHH0 Kv67Sfm+etdD8jM+1p6fYpNokkkmssBKuoeeZrBk= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Stefan Liebler To: glibc-cvs@sourceware.org Subject: [glibc] Fix getting return address in elf/tst-audit28.c. X-Act-Checkin: glibc X-Git-Author: Stefan Liebler X-Git-Refname: refs/heads/master X-Git-Oldrev: 8b9a0af8ca012217bf90d1dc0694f85b49ae09da X-Git-Newrev: 5d72e7e41a7860b911251bfc8dd3641460cc20a0 Message-Id: <20230719111921.641183858C66@sourceware.org> Date: Wed, 19 Jul 2023 11:19:21 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5d72e7e41a7860b911251bfc8dd3641460cc20a0 commit 5d72e7e41a7860b911251bfc8dd3641460cc20a0 Author: Stefan Liebler Date: Thu Jul 13 15:13:48 2023 +0200 Fix getting return address in elf/tst-audit28.c. Starting with commit 1bcfe0f732066ae5336b252295591ebe7e51c301, 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 Diff: --- elf/tst-auditmod28.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/elf/tst-auditmod28.c b/elf/tst-auditmod28.c index f6dfbbe202..35180208ba 100644 --- a/elf/tst-auditmod28.c +++ b/elf/tst-auditmod28.c @@ -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);