diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-07-18 08:00:49 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-07-18 08:01:06 -0700 |
| commit | 7fb613361cc4ca4bd929e89462ed99a3159232d6 (patch) | |
| tree | 1badb80cb9d0236bdfeceafeb3625e3ed08361e2 | |
| parent | 0a899af097a987f02c223a7f1fb2348d5bfea76c (diff) | |
| download | glibc-7fb613361cc4ca4bd929e89462ed99a3159232d6.tar.gz glibc-7fb613361cc4ca4bd929e89462ed99a3159232d6.tar.xz glibc-7fb613361cc4ca4bd929e89462ed99a3159232d6.zip | |
i386: Use _CET_NOTRACK in memcpy-ssse3.S
* sysdeps/i386/i686/multiarch/memcpy-ssse3.S (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump to jump table.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/memcpy-ssse3.S | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index dd82ae8ae3..322f484eda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 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. + +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. diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S index bb35c4c2b7..5ead569a5e 100644 --- a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S +++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S @@ -71,7 +71,7 @@ absolute address. */ \ addl (%ebx, INDEX, SCALE), %ebx; \ /* We loaded the jump table. Go. */ \ - jmp *%ebx + _CET_NOTRACK jmp *%ebx # else # define PARMS 4 @@ -85,7 +85,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 .section .text.ssse3,"ax",@progbits |