From e2d40a8822be27ddbd512599ea1955e52f90bf87 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 18 Jul 2018 08:07:24 -0700 Subject: [PATCH] x86-64: Use _CET_NOTRACK in memcmp-sse4.S * sysdeps/x86_64/multiarch/memcmp-sse4.S (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump to jump table. --- ChangeLog | 5 +++++ sysdeps/x86_64/multiarch/memcmp-sse4.S | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b594059..d1c5235 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2018-07-18 H.J. Lu + * sysdeps/x86_64/multiarch/memcmp-sse4.S (BRANCH_TO_JMPTBL_ENTRY): + Add _CET_NOTRACK before indirect jump to jump table. + +2018-07-18 H.J. Lu + * sysdeps/i386/i686/multiarch/memset-sse2-rep.S (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump to jump table. diff --git a/sysdeps/x86_64/multiarch/memcmp-sse4.S b/sysdeps/x86_64/multiarch/memcmp-sse4.S index 0d96d6b..8e164f2 100644 --- a/sysdeps/x86_64/multiarch/memcmp-sse4.S +++ b/sysdeps/x86_64/multiarch/memcmp-sse4.S @@ -31,7 +31,7 @@ lea TABLE(%rip), %r11; \ movslq (%r11, INDEX, SCALE), %rcx; \ add %r11, %rcx; \ - jmp *%rcx; \ + _CET_NOTRACK jmp *%rcx; \ ud2 /* Warning! -- 2.7.4