about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-07-18 08:07:24 -0700
committerH.J. Lu <hjl.tools@gmail.com>2018-07-18 08:07:32 -0700
commite2d40a8822be27ddbd512599ea1955e52f90bf87 (patch)
tree007fd4b8b0de078f875de8b47fdad0d15021693c
parent77a8ae0948e651a4c121a806c1eb8ab33a7d7e77 (diff)
downloadglibc-e2d40a8822be27ddbd512599ea1955e52f90bf87.tar.gz
glibc-e2d40a8822be27ddbd512599ea1955e52f90bf87.tar.xz
glibc-e2d40a8822be27ddbd512599ea1955e52f90bf87.zip
x86-64: Use _CET_NOTRACK in memcmp-sse4.S
	* sysdeps/x86_64/multiarch/memcmp-sse4.S (BRANCH_TO_JMPTBL_ENTRY):
	Add _CET_NOTRACK before indirect jump to jump table.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/multiarch/memcmp-sse4.S2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b594059f94..d1c5235849 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2018-07-18  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* sysdeps/x86_64/multiarch/memcmp-sse4.S (BRANCH_TO_JMPTBL_ENTRY):
+	Add _CET_NOTRACK before indirect jump to jump table.
+
+2018-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* sysdeps/i386/i686/multiarch/memset-sse2-rep.S
 	(BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump
 	to jump table.
diff --git a/sysdeps/x86_64/multiarch/memcmp-sse4.S b/sysdeps/x86_64/multiarch/memcmp-sse4.S
index 0d96d6b775..8e164f2cb6 100644
--- a/sysdeps/x86_64/multiarch/memcmp-sse4.S
+++ b/sysdeps/x86_64/multiarch/memcmp-sse4.S
@@ -31,7 +31,7 @@
   lea		TABLE(%rip), %r11;				\
   movslq	(%r11, INDEX, SCALE), %rcx;			\
   add		%r11, %rcx;					\
-  jmp		*%rcx;						\
+  _CET_NOTRACK jmp *%rcx;					\
   ud2
 
 /* Warning!