about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-07-18 07:58:53 -0700
committerH.J. Lu <hjl.tools@gmail.com>2018-07-18 07:59:04 -0700
commit177824e23274591dd549db0c0a4b569ee4ccd96b (patch)
treecf8c36fe41f928b2dfcc50450bf5ea80411af22b
parent00e7b76a8f44db5cdbcb2e561b8853fc93f3c070 (diff)
downloadglibc-177824e23274591dd549db0c0a4b569ee4ccd96b.tar.gz
glibc-177824e23274591dd549db0c0a4b569ee4ccd96b.tar.xz
glibc-177824e23274591dd549db0c0a4b569ee4ccd96b.zip
i386: Use _CET_NOTRACK in memcmp-sse4.S
	* sysdeps/i386/i686/multiarch/memcmp-sse4.S
	(BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump
	to jump table.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/i386/i686/multiarch/memcmp-sse4.S4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b466774bd7..5c2dd10248 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2018-07-18  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* sysdeps/i386/i686/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.S
 	(BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump
 	to jump table.
diff --git a/sysdeps/i386/i686/multiarch/memcmp-sse4.S b/sysdeps/i386/i686/multiarch/memcmp-sse4.S
index be37108987..bc2cb2729d 100644
--- a/sysdeps/i386/i686/multiarch/memcmp-sse4.S
+++ b/sysdeps/i386/i686/multiarch/memcmp-sse4.S
@@ -59,7 +59,7 @@
 	absolute	address.  */	\
 	addl	(%ebx,INDEX,SCALE), %ebx;	\
 /* We loaded the jump table and adjusted EDX/ESI. Go.  */	\
-	jmp	*%ebx
+	_CET_NOTRACK jmp *%ebx
 # else
 #  define JMPTBL(I, B)	I
 
@@ -67,7 +67,7 @@
 	jump	table with relative offsets.  INDEX is a register contains the
 	index	into the jump table.   SCALE is the scale of INDEX. */
 #  define BRANCH_TO_JMPTBL_ENTRY(TABLE, INDEX, SCALE)	\
-	jmp	*TABLE(,INDEX,SCALE)
+	_CET_NOTRACK jmp *TABLE(,INDEX,SCALE)
 # endif