diff options
| author | Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> | 2021-02-13 18:49:56 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> | 2021-02-13 18:49:56 -0300 |
| commit | cde88e739832faa9ef82fdadb01efdf9d66a9a00 (patch) | |
| tree | 394fe452e6f70936bc5be2a6a0e8365392a8c0db /sysdeps/x86 | |
| parent | 148200bda390e59c9c33193e2f6d73abcef417e7 (diff) | |
| parent | e9db77683e10c589529f452710868c3bde2c6d3f (diff) | |
| download | glibc-ibm/2.28/master.tar glibc-ibm/2.28/master.tar.gz glibc-ibm/2.28/master.tar.bz2 glibc-ibm/2.28/master.zip | |
Merge branch release/2.28/master into ibm/2.28/masteribm/2.28/master
Diffstat (limited to 'sysdeps/x86')
| -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 |
3 files changed, 12 insertions, 1 deletions
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile index 43ad4a79ff..891a4fdbb0 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 b82ba14e75..56c37bcd4f 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 0000000000..42c795d2a8 --- /dev/null +++ b/sysdeps/x86/tst-setjmp-cet.c @@ -0,0 +1 @@ +#include <setjmp/tst-setjmp.c> |