summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-07-18 08:02:15 -0700
committerH.J. Lu <hjl.tools@gmail.com>2018-07-18 08:02:26 -0700
commitf1574581c7431579952b4d9f2c4f57bb157b1637 (patch)
tree888cbb6e04356a8569bb735e7ba3635e7b594ce0
parent7fb613361cc4ca4bd929e89462ed99a3159232d6 (diff)
i386: Use _CET_NOTRACK in strcpy-sse2.S
* sysdeps/i386/i686/multiarch/strcpy-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/strcpy-sse2.S4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 322f484eda..5ad290907a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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.
+
+2018-07-18 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/i386/i686/multiarch/memcpy-ssse3.S
(BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump
to jump table.
diff --git a/sysdeps/i386/i686/multiarch/strcpy-sse2.S b/sysdeps/i386/i686/multiarch/strcpy-sse2.S
index 64bdb91df4..3fc27d93d4 100644
--- a/sysdeps/i386/i686/multiarch/strcpy-sse2.S
+++ b/sysdeps/i386/i686/multiarch/strcpy-sse2.S
@@ -65,7 +65,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
@@ -74,7 +74,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
.text