aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-07-18 07:59:54 -0700
committerH.J. Lu <hjl.tools@gmail.com>2018-07-18 08:00:09 -0700
commit0a899af097a987f02c223a7f1fb2348d5bfea76c (patch)
treeab2039a952e47f341e54fd9f0d0625eabe64deaf
parent177824e23274591dd549db0c0a4b569ee4ccd96b (diff)
downloadglibc-0a899af097a987f02c223a7f1fb2348d5bfea76c.tar
glibc-0a899af097a987f02c223a7f1fb2348d5bfea76c.tar.gz
glibc-0a899af097a987f02c223a7f1fb2348d5bfea76c.tar.bz2
glibc-0a899af097a987f02c223a7f1fb2348d5bfea76c.zip
i386: Use _CET_NOTRACK in memcpy-ssse3-rep.S
* sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump to jump table. (BRANCH_TO_JMPTBL_ENTRY_TAIL): Likewise.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S8
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c2dd10248..dd82ae8ae3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2018-07-18 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
+ (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump
+ to jump table.
+ (BRANCH_TO_JMPTBL_ENTRY_TAIL): Likewise.
+
+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.
diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
index 287f1df8ca..129310bd8a 100644
--- a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
+++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
@@ -71,7 +71,7 @@
absolute address. */ \
addl (%ebx,INDEX,SCALE), %ebx; \
/* We loaded the jump table. Go. */ \
- jmp *%ebx
+ _CET_NOTRACK jmp *%ebx
# define BRANCH_TO_JMPTBL_ENTRY_VALUE(TABLE) \
addl $(TABLE - .), %ebx
@@ -79,7 +79,7 @@
# define BRANCH_TO_JMPTBL_ENTRY_TAIL(TABLE, INDEX, SCALE) \
addl (%ebx,INDEX,SCALE), %ebx; \
/* We loaded the jump table. Go. */ \
- jmp *%ebx
+ _CET_NOTRACK jmp *%ebx
#else
# define PARMS 4
# define ENTRANCE
@@ -91,12 +91,12 @@
absolute 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)
# define BRANCH_TO_JMPTBL_ENTRY_VALUE(TABLE)
# define BRANCH_TO_JMPTBL_ENTRY_TAIL(TABLE, INDEX, SCALE) \
- jmp *TABLE(,INDEX,SCALE)
+ _CET_NOTRACK jmp *TABLE(,INDEX,SCALE)
#endif
.section .text.ssse3,"ax",@progbits