From 4ef60d95979b222daa69c2948c279d0912731e76 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 18 Jul 2018 06:29:21 -0700 Subject: [PATCH] x86_64: Use _CET_NOTRACK in strcmp.S * sysdeps/x86_64/strcmp.S (STRCMP): Add _CET_NOTRACK before indirect jump to jump table. --- ChangeLog | 5 +++++ sysdeps/x86_64/strcmp.S | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c628f7c5c9..1c9f4087eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-07-18 H.J. Lu + + * sysdeps/x86_64/strcmp.S (STRCMP): Add _CET_NOTRACK before + indirect jump to jump table. + 2018-07-18 Valery Timiriliyev [BZ #22241] diff --git a/sysdeps/x86_64/strcmp.S b/sysdeps/x86_64/strcmp.S index de54fce647..e16945b961 100644 --- a/sysdeps/x86_64/strcmp.S +++ b/sysdeps/x86_64/strcmp.S @@ -233,7 +233,7 @@ LABEL(bigger): lea LABEL(unaligned_table)(%rip), %r10 movslq (%r10, %r9,4), %r9 lea (%r10, %r9), %r10 - jmp *%r10 /* jump to corresponding case */ + _CET_NOTRACK jmp *%r10 /* jump to corresponding case */ /* * The following cases will be handled by ashr_0