about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-07-18 08:03:07 -0700
committerH.J. Lu <hjl.tools@gmail.com>2018-07-18 08:03:15 -0700
commit90d15dc577561c497f23477a3d322d9e83c70634 (patch)
tree9bbc2b6da99b11fc64a7bb0039c0cfa1490c689b
parentf1574581c7431579952b4d9f2c4f57bb157b1637 (diff)
downloadglibc-90d15dc577561c497f23477a3d322d9e83c70634.tar.gz
glibc-90d15dc577561c497f23477a3d322d9e83c70634.tar.xz
glibc-90d15dc577561c497f23477a3d322d9e83c70634.zip
i386: Use _CET_NOTRACK in strcat-sse2.S
	* sysdeps/i386/i686/multiarch/strcat-sse2.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/strcat-sse2.S4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ad290907a..475000e54d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2018-07-18  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* sysdeps/i386/i686/multiarch/strcat-sse2.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/strcpy-sse2.S
 	(BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump
 	to jump table.
diff --git a/sysdeps/i386/i686/multiarch/strcat-sse2.S b/sysdeps/i386/i686/multiarch/strcat-sse2.S
index bed0b66225..19d5f5f65d 100644
--- a/sysdeps/i386/i686/multiarch/strcat-sse2.S
+++ b/sysdeps/i386/i686/multiarch/strcat-sse2.S
@@ -50,7 +50,7 @@
 	absolute address.  */	\
 	addl	(%ecx,INDEX,SCALE), %ecx;	\
 	/* We loaded the jump table and adjusted ECX. Go.  */	\
-	jmp	*%ecx
+	_CET_NOTRACK jmp *%ecx
 # else
 #  define JMPTBL(I, B) I
 
@@ -59,7 +59,7 @@
 	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
 
 # ifndef STRCAT