From: H.J. Lu Date: Wed, 18 Jul 2018 15:03:07 +0000 (-0700) Subject: i386: Use _CET_NOTRACK in strcat-sse2.S X-Git-Tag: glibc-2.28~76 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90d15dc577;p=thirdparty%2Fglibc.git i386: Use _CET_NOTRACK in strcat-sse2.S * sysdeps/i386/i686/multiarch/strcat-sse2.S (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump to jump table. --- diff --git a/ChangeLog b/ChangeLog index 5ad290907a1..475000e54d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-07-18 H.J. Lu + + * sysdeps/i386/i686/multiarch/strcat-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/strcpy-sse2.S diff --git a/sysdeps/i386/i686/multiarch/strcat-sse2.S b/sysdeps/i386/i686/multiarch/strcat-sse2.S index bed0b662250..19d5f5f65d5 100644 --- a/sysdeps/i386/i686/multiarch/strcat-sse2.S +++ b/sysdeps/i386/i686/multiarch/strcat-sse2.S @@ -50,7 +50,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 @@ -59,7 +59,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 # ifndef STRCAT