From 47e778b4e0f3c538ab1f6845056cdf115abe4c89 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Thu, 28 Dec 2023 18:31:32 +0000 Subject: aarch64: Use l_searchlist.r_list for bti Allows using the same function for static exe. TODO: not clear if the two are always equivalent other than the ordering and in case of static linking when dl-support.c leaves l_initfini NULL. --- 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); } -- cgit 1.4.1