From: H.J. Lu Date: Wed, 18 Jul 2018 15:00:49 +0000 (-0700) Subject: i386: Use _CET_NOTRACK in memcpy-ssse3.S X-Git-Tag: glibc-2.28~78 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fb613361c;p=thirdparty%2Fglibc.git 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. --- diff --git a/ChangeLog b/ChangeLog index dd82ae8ae3c..322f484edac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-07-18 H.J. Lu + + * 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 * sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S index bb35c4c2b76..5ead569a5e7 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