diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-07-18 07:57:50 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-07-18 07:57:59 -0700 |
| commit | 00e7b76a8f44db5cdbcb2e561b8853fc93f3c070 (patch) | |
| tree | 1f0ae2d08528911986bf4dfde915c8c2889f46b7 | |
| parent | 7e119cd5828768eca6547494242699ea76fa30c0 (diff) | |
| download | glibc-00e7b76a8f44db5cdbcb2e561b8853fc93f3c070.tar.gz glibc-00e7b76a8f44db5cdbcb2e561b8853fc93f3c070.tar.xz glibc-00e7b76a8f44db5cdbcb2e561b8853fc93f3c070.zip | |
i386: Use _CET_NOTRACK in memset-sse2.S
* sysdeps/i386/i686/multiarch/memset-sse2.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.S | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index dba41dbde8..b466774bd7 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.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/memcmp.S (memcmp): Add _CET_NOTRACK before indirect jump to jump table. diff --git a/sysdeps/i386/i686/multiarch/memset-sse2.S b/sysdeps/i386/i686/multiarch/memset-sse2.S index 8869c80f25..5c9eba1e65 100644 --- a/sysdeps/i386/i686/multiarch/memset-sse2.S +++ b/sysdeps/i386/i686/multiarch/memset-sse2.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 |