diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2021-01-12 19:00:13 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2021-01-13 09:24:35 -0800 |
| commit | 420ade1f64470df358a497f156cb316beb079831 (patch) | |
| tree | 7b7cd18cfc6de8044bb073f8aff98fb4bebcb77d | |
| parent | 8493ba72b1a391e30b2518e82df4dc2e67e1b948 (diff) | |
| download | glibc-420ade1f64470df358a497f156cb316beb079831.zip glibc-420ade1f64470df358a497f156cb316beb079831.tar.gz glibc-420ade1f64470df358a497f156cb316beb079831.tar.bz2 | |
x86: Set header.feature_1 in TCB for always-on CET [BZ #27177]
Update dl_cet_check() to set header.feature_1 in TCB when both IBT and
SHSTK are always on.
(cherry picked from commit 2ef23b520597f4ea1790a669b83e608f24f4cf12)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sysdeps/x86/Makefile | 6 | ||||
| -rw-r--r-- | sysdeps/x86/dl-cet.c | 6 | ||||
| -rw-r--r-- | sysdeps/x86/tst-setjmp-cet.c | 1 |
4 files changed, 13 insertions, 1 deletions
@@ -42,6 +42,7 @@ The following bugs are resolved with this release: [25933] Off by one error in __strncmp_avx2 [25976] nss_compat: internal_end*ent may clobber errno, hiding ERANGE [27130] "rep movsb" performance issue + [27177] GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on doesn't work Security related changes: diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile index 95182a5..a5112ef 100644 --- a/sysdeps/x86/Makefile +++ b/sysdeps/x86/Makefile @@ -12,6 +12,12 @@ endif ifeq ($(subdir),setjmp) gen-as-const-headers += jmp_buf-ssp.sym sysdep_routines += __longjmp_cancel +ifneq ($(enable-cet),no) +ifneq ($(have-tunables),no) +tests += tst-setjmp-cet +tst-setjmp-cet-ENV = GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on +endif +endif endif ifeq ($(enable-cet),yes) diff --git a/sysdeps/x86/dl-cet.c b/sysdeps/x86/dl-cet.c index 4f70497..2160263 100644 --- a/sysdeps/x86/dl-cet.c +++ b/sysdeps/x86/dl-cet.c @@ -105,7 +105,11 @@ dl_cet_check (struct link_map *m, const char *program) /* No legacy object check if both IBT and SHSTK are always on. */ if (enable_ibt_type == CET_ALWAYS_ON && enable_shstk_type == CET_ALWAYS_ON) - return; + { + THREAD_SETMEM (THREAD_SELF, header.feature_1, + GL(dl_x86_feature_1)[0]); + return; + } /* Check if IBT is enabled by kernel. */ bool ibt_enabled diff --git a/sysdeps/x86/tst-setjmp-cet.c b/sysdeps/x86/tst-setjmp-cet.c new file mode 100644 index 0000000..42c795d --- /dev/null +++ b/sysdeps/x86/tst-setjmp-cet.c @@ -0,0 +1 @@ +#include <setjmp/tst-setjmp.c> |