From: H.J. Lu Date: Wed, 18 Jul 2018 15:02:15 +0000 (-0700) Subject: i386: Use _CET_NOTRACK in strcpy-sse2.S X-Git-Tag: glibc-2.28~77 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1574581c7;p=thirdparty%2Fglibc.git i386: Use _CET_NOTRACK in strcpy-sse2.S * sysdeps/i386/i686/multiarch/strcpy-sse2.S (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump to jump table. --- diff --git a/ChangeLog b/ChangeLog index 322f484edac..5ad290907a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-07-18 H.J. Lu + + * sysdeps/i386/i686/multiarch/strcpy-sse2.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.S diff --git a/sysdeps/i386/i686/multiarch/strcpy-sse2.S b/sysdeps/i386/i686/multiarch/strcpy-sse2.S index 64bdb91df4d..3fc27d93d42 100644 --- a/sysdeps/i386/i686/multiarch/strcpy-sse2.S +++ b/sysdeps/i386/i686/multiarch/strcpy-sse2.S @@ -65,7 +65,7 @@ absolute address. */ \ addl (%ecx,INDEX,SCALE), %ecx; \ /* We loaded the jump table and adjusted ECX. Go. */ \ - jmp *%ecx + _CET_NOTRACK jmp *%ecx # else # define JMPTBL(I, B) I @@ -74,7 +74,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 .text