diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-07-18 08:04:04 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-07-18 08:04:12 -0700 |
| commit | 77a8ae0948e651a4c121a806c1eb8ab33a7d7e77 (patch) | |
| tree | d9771ac21106964b5658176029948c18ce713626 | |
| parent | 90d15dc577561c497f23477a3d322d9e83c70634 (diff) | |
| download | glibc-77a8ae0948e651a4c121a806c1eb8ab33a7d7e77.tar.gz glibc-77a8ae0948e651a4c121a806c1eb8ab33a7d7e77.tar.xz glibc-77a8ae0948e651a4c121a806c1eb8ab33a7d7e77.zip | |
i386: Use _CET_NOTRACK in memset-sse2-rep.S
* sysdeps/i386/i686/multiarch/memset-sse2-rep.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/memset-sse2-rep.S | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 475000e54d..b594059f94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2018-07-18 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/i386/i686/multiarch/memset-sse2-rep.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/strcat-sse2.S (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump to jump table. diff --git a/sysdeps/i386/i686/multiarch/memset-sse2-rep.S b/sysdeps/i386/i686/multiarch/memset-sse2-rep.S index 9d6648b5ce..8732aac0b9 100644 --- a/sysdeps/i386/i686/multiarch/memset-sse2-rep.S +++ b/sysdeps/i386/i686/multiarch/memset-sse2-rep.S @@ -63,7 +63,7 @@ add (%ebx,%ecx,4), %ebx; \ add %ecx, %edx; \ /* We loaded the jump table and adjusted EDX. Go. */ \ - jmp *%ebx + _CET_NOTRACK jmp *%ebx #else # define ENTRANCE # define RETURN_END ret @@ -75,7 +75,7 @@ absolute offsets. */ # define BRANCH_TO_JMPTBL_ENTRY(TABLE) \ add %ecx, %edx; \ - jmp *TABLE(,%ecx,4) + _CET_NOTRACK jmp *TABLE(,%ecx,4) #endif .section .text.sse2,"ax",@progbits |