From 811e9e52b2bd2fb59b981b174ad30489d2574081 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 18 Jul 2018 06:38:10 -0700 Subject: x86-64: Use _CET_NOTRACK in memcpy-ssse3-back.S * sysdeps/x86_64/multiarch/memcpy-ssse3-back.S (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump to jump table. (MEMCPY): Likewise. --- ChangeLog | 7 +++++++ sysdeps/x86_64/multiarch/memcpy-ssse3-back.S | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b8f4d0aae..5bdb9325b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-07-18 H.J. Lu + + * sysdeps/x86_64/multiarch/memcpy-ssse3-back.S + (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump + to jump table. + (MEMCPY): Likewise. + 2018-07-18 H.J. Lu * sysdeps/x86_64/multiarch/strcmp-sse42.S (STRCMP_SSE42): Add diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S index 7e37035487..3cd1123326 100644 --- a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S +++ b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S @@ -39,7 +39,7 @@ lea TABLE(%rip), %r11; \ movslq (%r11, INDEX, SCALE), INDEX; \ lea (%r11, INDEX), INDEX; \ - jmp *INDEX; \ + _CET_NOTRACK jmp *INDEX; \ ud2 .section .text.ssse3,"ax",@progbits @@ -125,7 +125,7 @@ L(144bytesormore): sub $0x80, %rdx movslq (%r11, %r9, 4), %r9 add %r11, %r9 - jmp *%r9 + _CET_NOTRACK jmp *%r9 ud2 .p2align 4 @@ -155,7 +155,7 @@ L(copy_backward): sub $0x80, %rdx movslq (%r11, %r9, 4), %r9 add %r11, %r9 - jmp *%r9 + _CET_NOTRACK jmp *%r9 ud2 .p2align 4 -- cgit v1.2.3