From patchwork Thu Jul 13 13:13:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1807295 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=S21DPgmJ; dkim-atps=neutral Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R1w7j6j8zz20c6 for ; Thu, 13 Jul 2023 23:14:57 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 773E13858439 for ; Thu, 13 Jul 2023 13:14:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 773E13858439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689254095; bh=bC+XztZWVqAyFvpDpe4kM6ptvLoc7NMUSUtUvIfZxqA=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=S21DPgmJ+fVoCCziVdAjXZ7ROCntkpj/JqB50cckWEd52cxpw0wvuS/DBA7bbGd3O Apoh4i+/yDSEJqPRSYKyKDcElh9Jan96cacntTN9XWf3wsX9XZciCEAEMnJEIMP23w l/vVu8sAI042iCz6NR6U/XiOfLlUcSXAXdJd51c4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id AE5043858289 for ; Thu, 13 Jul 2023 13:14:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AE5043858289 Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36DDBKUg023221 for ; Thu, 13 Jul 2023 13:14:05 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rthk2rk39-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 13 Jul 2023 13:14:05 +0000 Received: from m0353722.ppops.net (m0353722.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 36DDCATZ028286 for ; Thu, 13 Jul 2023 13:14:05 GMT Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rthk2rk2m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jul 2023 13:14:04 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 36DClqrH004321; Thu, 13 Jul 2023 13:14:03 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma05fra.de.ibm.com (PPS) with ESMTPS id 3rpye5acad-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jul 2023 13:14:03 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36DDDwvb48038306 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 13 Jul 2023 13:13:59 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CC71C20043; Thu, 13 Jul 2023 13:13:58 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9DB9320040; Thu, 13 Jul 2023 13:13:58 +0000 (GMT) Received: from a35lp68.lnxne.boe (unknown [9.152.108.100]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 13 Jul 2023 13:13:58 +0000 (GMT) To: libc-alpha@sourceware.org Cc: fweimer@redhat.com, Stefan Liebler Subject: [PATCH] Fix getting return address in elf/tst-audit28.c. Date: Thu, 13 Jul 2023 15:13:48 +0200 Message-ID: <20230713131348.985999-1-stli@linux.ibm.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: WAqwXM8f2Mxeu7nZHeyf_6hFhUMvfwGK X-Proofpoint-ORIG-GUID: -flOfRB8k4lppmG9lNZr9qtNFa01fUo4 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-13_05,2023-07-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 phishscore=0 clxscore=1015 suspectscore=0 impostorscore=0 spamscore=0 bulkscore=0 mlxlogscore=696 priorityscore=1501 malwarescore=0 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2307130114 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Stefan Liebler via Libc-alpha From: Stefan Liebler Reply-To: Stefan Liebler Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" 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 --- 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);