about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/x86
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2020-04-28 10:05:25 -0700
committerH.J. Lu <hjl.tools@gmail.com>2020-05-18 06:15:02 -0700
commit674ea88294bfb8d89878a0ebbbcec38a85e118a5 (patch)
tree35c81a44dc6e7eea5f406bbba208dec19f2114a7 /sysdeps/unix/sysv/linux/x86
parentcbfc16122e9c4948b3a17224aeb5f8b70f02417d (diff)
downloadglibc-674ea88294bfb8d89878a0ebbbcec38a85e118a5.tar.gz
glibc-674ea88294bfb8d89878a0ebbbcec38a85e118a5.tar.xz
glibc-674ea88294bfb8d89878a0ebbbcec38a85e118a5.zip
x86: Move CET control to _dl_x86_feature_control [BZ #25887]
1. Include <dl-procruntime.c> to get architecture specific initializer in
rtld_global.
2. Change _dl_x86_feature_1[2] to _dl_x86_feature_1.
3. Add _dl_x86_feature_control after _dl_x86_feature_1, which is a
struct of 2 bitfields for IBT and SHSTK control

This fixes [BZ #25887].
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86')
-rw-r--r--sysdeps/unix/sysv/linux/x86/cpu-features.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/x86/cpu-features.c b/sysdeps/unix/sysv/linux/x86/cpu-features.c
index d67b300595..fc0e32827d 100644
--- a/sysdeps/unix/sysv/linux/x86/cpu-features.c
+++ b/sysdeps/unix/sysv/linux/x86/cpu-features.c
@@ -34,7 +34,7 @@ static inline void
 x86_setup_tls (void)
 {
   __libc_setup_tls ();
-  THREAD_SETMEM (THREAD_SELF, header.feature_1, GL(dl_x86_feature_1)[0]);
+  THREAD_SETMEM (THREAD_SELF, header.feature_1, GL(dl_x86_feature_1));
 }
 
 #  define ARCH_SETUP_TLS() x86_setup_tls ()