From 90d15dc577561c497f23477a3d322d9e83c70634 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 18 Jul 2018 08:03:07 -0700 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ sysdeps/i386/i686/multiarch/strcat-sse2.S | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ad290907a..475000e54d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 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 (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump to jump table. diff --git a/sysdeps/i386/i686/multiarch/strcat-sse2.S b/sysdeps/i386/i686/multiarch/strcat-sse2.S index bed0b66225..19d5f5f65d 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 -- 2.11.4.GIT