From: H.J. Lu Date: Wed, 18 Jul 2018 13:32:54 +0000 (-0700) Subject: x86-64: Use _CET_NOTRACK in strcpy-sse2-unaligned.S X-Git-Tag: glibc-2.28~86 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=921595d151ee1661cc5476bb019483e12b7b47f6;p=thirdparty%2Fglibc.git x86-64: Use _CET_NOTRACK in strcpy-sse2-unaligned.S * sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump to jump table. --- diff --git a/ChangeLog b/ChangeLog index 1c9f4087ebd..cf1bac4fff7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-07-18 H.J. Lu + + * sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S + (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump + to jump table. + 2018-07-18 H.J. Lu * sysdeps/x86_64/strcmp.S (STRCMP): Add _CET_NOTRACK before diff --git a/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S b/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S index 56b748eb2c2..72bf7e8586b 100644 --- a/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S +++ b/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S @@ -33,7 +33,7 @@ lea TABLE(%rip), %r11; \ movslq (%r11, INDEX, SCALE), %rcx; \ lea (%r11, %rcx), %rcx; \ - jmp *%rcx + _CET_NOTRACK jmp *%rcx # ifndef USE_AS_STRCAT