From: H.J. Lu <hjl.tools@gmail.com>
Date: Sat, 16 Dec 2023 16:53:10 +0000 (-0800)
Subject: x86/cet: Check user_shstk in /proc/cpuinfo
X-Git-Tag: glibc-2.39~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b850186fd3177311f10dcb938b668cc750fa3be;p=thirdparty%2Fglibc.git

x86/cet: Check user_shstk in /proc/cpuinfo

Linux kernel reports CPU shadow stack feature in /proc/cpuinfo as
user_shstk, instead of shstk.
---

diff --git a/sysdeps/x86/tst-cpu-features-cpuinfo.c b/sysdeps/x86/tst-cpu-features-cpuinfo.c
index 18d64375cad..1d6c647b707 100644
--- a/sysdeps/x86/tst-cpu-features-cpuinfo.c
+++ b/sysdeps/x86/tst-cpu-features-cpuinfo.c
@@ -246,7 +246,7 @@ do_test (int argc, char **argv)
   fails += CHECK_PROC (sgx, SGX);
   fails += CHECK_PROC (sgx_lc, SGX_LC);
   fails += CHECK_PROC (sha_ni, SHA);
-  fails += CHECK_PROC (shstk, SHSTK);
+  fails += CHECK_PROC (user_shstk, SHSTK);
   fails += CHECK_PROC (smap, SMAP);
   fails += CHECK_PROC (smep, SMEP);
   fails += CHECK_PROC (smx, SMX);