From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 18 Jul 2018 13:29:21 +0000 (-0700)
Subject: x86_64: Use _CET_NOTRACK in strcmp.S
X-Git-Tag: glibc-2.28~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ef60d95979b222daa69c2948c279d0912731e76;p=thirdparty%2Fglibc.git

x86_64: Use _CET_NOTRACK in strcmp.S

	* sysdeps/x86_64/strcmp.S (STRCMP): Add _CET_NOTRACK before
	indirect jump to jump table.
---

diff --git a/ChangeLog b/ChangeLog
index c628f7c5c9e..1c9f4087ebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/strcmp.S (STRCMP): Add _CET_NOTRACK before
+	indirect jump to jump table.
+
 2018-07-18  Valery Timiriliyev  <timiriliyev@gmail.com>
 
 	[BZ #22241]
diff --git a/sysdeps/x86_64/strcmp.S b/sysdeps/x86_64/strcmp.S
index de54fce6471..e16945b9616 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