From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 09E48385E019; Wed, 14 Feb 2024 15:07:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 09E48385E019 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1707923250; bh=Jdu1gO9fPpSPURTMXXgABaVSFjOGwHdXLFpB4ktud1A=; h=From:To:Subject:Date:From; b=CRWAKI48OiFgp6mPipHHhLToI7vQuNhTQ4mOpFuDFQ0QKtHljPxWDx572L4W26HyC 9MsJ/2/j9kFDN1UXv6vxD6F+DUNPd6wzUcRTi8aW2xxtD4EuTmTDmKMKxX5TJk+orL ZxpIiKysOzLnugWqoXT80lY2mleU4O6rdTawPWcM= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/gcs] aarch64: use l_searchlist.r_list for bti X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/gcs X-Git-Oldrev: 1e348038b0f013ef9c30e3c4072b9555344391cb X-Git-Newrev: 92cd77cd36137d81ac9500f595f0c4d0c3c6539d Message-Id: <20240214150730.09E48385E019@sourceware.org> Date: Wed, 14 Feb 2024 15:07:29 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=92cd77cd36137d81ac9500f595f0c4d0c3c6539d commit 92cd77cd36137d81ac9500f595f0c4d0c3c6539d Author: Szabolcs Nagy Date: Thu Dec 28 18:31:32 2023 +0000 aarch64: use l_searchlist.r_list for bti Allows using the same function for static exe. Diff: --- sysdeps/aarch64/dl-bti.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sysdeps/aarch64/dl-bti.c b/sysdeps/aarch64/dl-bti.c index fd0d308a39..e03bfc2acb 100644 --- a/sysdeps/aarch64/dl-bti.c +++ b/sysdeps/aarch64/dl-bti.c @@ -84,10 +84,9 @@ _dl_bti_check (struct link_map *l, const char *program) if (l->l_mach.bti_fail) bti_failed (l, program); - unsigned int i = l->l_searchlist.r_nlist; - while (i-- > 0) + for (unsigned int i = 0; i < l->l_searchlist.r_nlist; i++) { - struct link_map *dep = l->l_initfini[i]; + struct link_map *dep = l->l_searchlist.r_list[i]; if (dep->l_mach.bti_fail) bti_failed (dep, program); }