about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-07-18 06:29:21 -0700
committerH.J. Lu <hjl.tools@gmail.com>2018-07-18 06:31:53 -0700
commit4ef60d95979b222daa69c2948c279d0912731e76 (patch)
treefac92a4ceaed0863592e75146231233cd3345e5f
parent61c4aad70553200b3473d9e4e97c240b8ea6d336 (diff)
downloadglibc-4ef60d95979b222daa69c2948c279d0912731e76.tar.gz
glibc-4ef60d95979b222daa69c2948c279d0912731e76.tar.xz
glibc-4ef60d95979b222daa69c2948c279d0912731e76.zip
x86_64: Use _CET_NOTRACK in strcmp.S
	* sysdeps/x86_64/strcmp.S (STRCMP): Add _CET_NOTRACK before
	indirect jump to jump table.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/strcmp.S2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c628f7c5c9..1c9f4087eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/strcmp.S (STRCMP): Add _CET_NOTRACK before
+	indirect jump to jump table.
+
 2018-07-18  Valery Timiriliyev  <timiriliyev@gmail.com>
 
 	[BZ #22241]
diff --git a/sysdeps/x86_64/strcmp.S b/sysdeps/x86_64/strcmp.S
index de54fce647..e16945b961 100644
--- a/sysdeps/x86_64/strcmp.S
+++ b/sysdeps/x86_64/strcmp.S
@@ -233,7 +233,7 @@ LABEL(bigger):
 	lea	LABEL(unaligned_table)(%rip), %r10
 	movslq	(%r10, %r9,4), %r9
 	lea	(%r10, %r9), %r10
-	jmp	*%r10				/* jump to corresponding case */
+	_CET_NOTRACK jmp *%r10			/* jump to corresponding case */
 
 /*
  * The following cases will be handled by ashr_0