[glibc/release/2.32/master] x86: Set header.feature_1 in TCB for always-on CET [BZ #27177]

[glibc/release/2.32/master] x86: Set header.feature_1 in TCB for always-on CET [BZ #27177]

[H.J. Lu]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=87450ecf8a80fa0572ec3a99abad30d11b5ccd4b

commit 87450ecf8a80fa0572ec3a99abad30d11b5ccd4b
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Jan 12 19:00:13 2021 -0800

    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)

Diff:
---
 NEWS                         | 1 +
 sysdeps/x86/Makefile         | 6 ++++++
 sysdeps/x86/dl-cet.c         | 5 ++++-
 sysdeps/x86/tst-setjmp-cet.c | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 5c32a966b7..8b589b175b 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@ The following bugs are resolved with this release:
   [26853] aarch64: Missing unwind information in statically linked startup code
   [26932] libc: sh: Multiple floating point functions defined as stubs only
   [27130] "rep movsb" performance issue
+  [27177] GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on doesn't work
 
 Version 2.32
 
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
index a6736aef25..9736a13e7b 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 ($(subdir),string)
diff --git a/sysdeps/x86/dl-cet.c b/sysdeps/x86/dl-cet.c
index 03572f7af6..3cc54a8d53 100644
--- a/sysdeps/x86/dl-cet.c
+++ b/sysdeps/x86/dl-cet.c
@@ -47,7 +47,10 @@ 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));
+      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>