From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id 607123858D32 for ; Wed, 19 Jul 2023 07:11:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 607123858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36J7B5Tg009736 for ; Wed, 19 Jul 2023 07:11:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=932oaYgU2ynCO+Yfzd0M41VBLdBD9YRYYF0ZYJQpfVU=; b=UQrsDhJt1JQCRsXgvqOfeU1D3lLFeR0iYuEmtEetU+0q+GyoEUkk3kFt/V0pdHkJX8Js ngE8fOJ3H8zk+YP2ZJfKo9UCCivlHV5qglcBkvuoDXcEo2zCj029hwOR2TCIxWKSUf75 SvfdF2/KC0XrUfjjacYC48kCnxbPKU6xCRl4k5KnfFhAQgMz/xPqJzfMgcuVdUCrg8MH OSxR5Zg/siWRcwANUcq1bH6c+05KkGZGMXXyfkGmmqqtSuDHntWA+FgSMAokQZjx4ZXY ytU/JGv6qvsmPEVaDKCcj6wfZmyGC2O9etbgr3S/H/ZdEmveZe/OKQlGYfcH6RDVAiRT SQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rx8w7uag0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 19 Jul 2023 07:11:27 +0000 Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 36J7BQIv012828 for ; Wed, 19 Jul 2023 07:11:26 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rx8w7ua2m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 19 Jul 2023 07:11:22 +0000 Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 36J52g0m004183; Wed, 19 Jul 2023 07:06:42 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3rv8g116w9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 19 Jul 2023 07:06:42 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36J76e4S24576758 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 19 Jul 2023 07:06:40 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 926B22004B; Wed, 19 Jul 2023 07:06:40 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7ECCF20043; Wed, 19 Jul 2023 07:06:40 +0000 (GMT) Received: from [9.152.222.232] (unknown [9.152.222.232]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 19 Jul 2023 07:06:40 +0000 (GMT) Message-ID: <9035b6a2-f4c1-7f91-327e-206ac558a77d@linux.ibm.com> Date: Wed, 19 Jul 2023 09:06:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH] Fix getting return address in elf/tst-audit28.c. To: libc-alpha@sourceware.org Cc: fweimer@redhat.com References: <20230713131348.985999-1-stli@linux.ibm.com> Content-Language: en-US From: Stefan Liebler In-Reply-To: <20230713131348.985999-1-stli@linux.ibm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Et2-ftnWaO9j1NWKDENP6S53we0AfDpO X-Proofpoint-ORIG-GUID: 8w6CIkznIqlEwkrNYLk3OBmE1xWQlw1d X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-19_04,2023-07-18_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 bulkscore=0 adultscore=0 priorityscore=1501 mlxlogscore=891 malwarescore=0 spamscore=0 suspectscore=0 clxscore=1015 phishscore=0 impostorscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307190064 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Ping On 13.07.23 15:13, Stefan Liebler wrote: > 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. > --- > 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); >