aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-07-18 06:32:54 -0700
committerH.J. Lu <hjl.tools@gmail.com>2018-07-18 06:33:06 -0700
commit921595d151ee1661cc5476bb019483e12b7b47f6 (patch)
treeb3b827e71677cffaf837a4db4cd0762d5f80c5fa
parent4ef60d95979b222daa69c2948c279d0912731e76 (diff)
downloadglibc-921595d151ee1661cc5476bb019483e12b7b47f6.tar
glibc-921595d151ee1661cc5476bb019483e12b7b47f6.tar.gz
glibc-921595d151ee1661cc5476bb019483e12b7b47f6.tar.bz2
glibc-921595d151ee1661cc5476bb019483e12b7b47f6.zip
x86-64: Use _CET_NOTRACK in strcpy-sse2-unaligned.S
* sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump to jump table.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c9f4087eb..cf1bac4fff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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.
+
+2018-07-18 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/x86_64/strcmp.S (STRCMP): Add _CET_NOTRACK before
indirect jump to jump table.
diff --git a/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S b/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S
index 56b748eb2c..72bf7e8586 100644
--- a/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S
+++ b/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S
@@ -33,7 +33,7 @@
lea TABLE(%rip), %r11; \
movslq (%r11, INDEX, SCALE), %rcx; \
lea (%r11, %rcx), %rcx; \
- jmp *%rcx
+ _CET_NOTRACK jmp *%rcx
# ifndef USE_AS_STRCAT