diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-04-28 10:05:25 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2020-05-18 06:15:02 -0700 |
| commit | 674ea88294bfb8d89878a0ebbbcec38a85e118a5 (patch) | |
| tree | 35c81a44dc6e7eea5f406bbba208dec19f2114a7 /sysdeps/i386/dl-machine.h | |
| parent | cbfc16122e9c4948b3a17224aeb5f8b70f02417d (diff) | |
| download | glibc-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/i386/dl-machine.h')
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 8af0789a9c..0f08079e48 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -71,7 +71,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) extern void _dl_runtime_profile_shstk (Elf32_Word) attribute_hidden; /* Check if SHSTK is enabled by kernel. */ bool shstk_enabled - = (GL(dl_x86_feature_1)[0] & GNU_PROPERTY_X86_FEATURE_1_SHSTK) != 0; + = (GL(dl_x86_feature_1) & GNU_PROPERTY_X86_FEATURE_1_SHSTK) != 0; if (l->l_info[DT_JMPREL] && lazy) { |