about summary refs log tree commit diff
path: root/sysdeps/x86/tst-cet-legacy-6.c
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2020-03-18 04:35:54 -0700
committerH.J. Lu <hjl.tools@gmail.com>2020-03-18 04:35:54 -0700
commit1fabdb99084df004f7f4cdc7068d1be209a258be (patch)
tree3d0bdb677e7bc8d6d1080d37604a1cf4b3253d21 /sysdeps/x86/tst-cet-legacy-6.c
parent49348beafe9ba150c9bd48595b3f372299bddbb0 (diff)
downloadglibc-1fabdb99084df004f7f4cdc7068d1be209a258be.tar.gz
glibc-1fabdb99084df004f7f4cdc7068d1be209a258be.tar.xz
glibc-1fabdb99084df004f7f4cdc7068d1be209a258be.zip
x86: Remove ARCH_CET_LEGACY_BITMAP [BZ #25397]
Since legacy bitmap doesn't cover jitted code generated by legacy JIT
engine, it isn't very useful.  This patch removes ARCH_CET_LEGACY_BITMAP
and treats indirect branch tracking similar to shadow stack by removing
legacy bitmap support.

Tested on CET Linux/x86-64 and non-CET Linux/x86-64.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/x86/tst-cet-legacy-6.c')
-rw-r--r--sysdeps/x86/tst-cet-legacy-6.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/x86/tst-cet-legacy-6.c b/sysdeps/x86/tst-cet-legacy-6.c
index 877e77747d..bdbbb9075f 100644
--- a/sysdeps/x86/tst-cet-legacy-6.c
+++ b/sysdeps/x86/tst-cet-legacy-6.c
@@ -35,7 +35,8 @@ do_test_1 (const char *modname, bool fail)
       if (fail)
 	{
 	  const char *err = dlerror ();
-	  if (strstr (err, "shadow stack isn't enabled") == NULL)
+	  if (strstr (err, "rebuild shared object with SHSTK support enabled")
+	      == NULL)
 	    {
 	      printf ("incorrect dlopen '%s' error: %s\n", modname,
 		      err);