lkml.org 
[lkml]   [2020]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 1/6] aarch64: Fix missing BTI protection from dependencies [BZ #26926]
Date
The _dl_open_check and _rtld_main_check hooks are not called on the
dependencies of a loaded module, so BTI protection was missed on
every module other than the main executable and directly dlopened
libraries.

The fix just iterates over dependencies to enable BTI.

Fixes bug 26926.
---
sysdeps/aarch64/dl-bti.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/sysdeps/aarch64/dl-bti.c b/sysdeps/aarch64/dl-bti.c
index 196e462520..8f4728adce 100644
--- a/sysdeps/aarch64/dl-bti.c
+++ b/sysdeps/aarch64/dl-bti.c
@@ -51,11 +51,24 @@ enable_bti (struct link_map *map, const char *program)
return 0;
}

-/* Enable BTI for L if required. */
+/* Enable BTI for MAP and its dependencies. */

void
-_dl_bti_check (struct link_map *l, const char *program)
+_dl_bti_check (struct link_map *map, const char *program)
{
- if (GLRO(dl_aarch64_cpu_features).bti && l->l_mach.bti)
- enable_bti (l, program);
+ if (!GLRO(dl_aarch64_cpu_features).bti)
+ return;
+
+ if (map->l_mach.bti)
+ enable_bti (map, program);
+
+ unsigned int i = map->l_searchlist.r_nlist;
+ while (i-- > 0)
+ {
+ struct link_map *l = map->l_initfini[i];
+ if (l->l_init_called)
+ continue;
+ if (l->l_mach.bti)
+ enable_bti (l, program);
+ }
}
--
2.17.1
\
 
 \ /
  Last update: 2020-11-27 14:21    [W:0.183 / U:0.608 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site