summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-07-18 06:36:06 -0700
committerH.J. Lu <hjl.tools@gmail.com>2018-07-18 06:37:09 -0700
commit8817df42650af57e8d1c4bab4c73b78375d6cfaf (patch)
tree2da86a8fb4e79315f009922acbb46af83e2e0d14
parent921595d151ee1661cc5476bb019483e12b7b47f6 (diff)
x86-64: Use _CET_NOTRACK in strcmp-sse42.S
* sysdeps/x86_64/multiarch/strcmp-sse42.S (STRCMP_SSE42): Add _CET_NOTRACK before indirect jump to jump table.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/multiarch/strcmp-sse42.S2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cf1bac4fff..5b8f4d0aae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2018-07-18 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/x86_64/multiarch/strcmp-sse42.S (STRCMP_SSE42): Add
+ _CET_NOTRACK before indirect jump to jump table.
+
+2018-07-18 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S
(BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump
to jump table.
diff --git a/sysdeps/x86_64/multiarch/strcmp-sse42.S b/sysdeps/x86_64/multiarch/strcmp-sse42.S
index 5a0c6668a7..d3c07bd292 100644
--- a/sysdeps/x86_64/multiarch/strcmp-sse42.S
+++ b/sysdeps/x86_64/multiarch/strcmp-sse42.S
@@ -275,7 +275,7 @@ LABEL(bigger):
movslq (%r10, %r9,4), %r9
pcmpeqb %xmm1, D(%xmm0) /* Any null chars? */
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