From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 18 Jul 2018 14:54:45 +0000 (-0700)
Subject: i386: Use _CET_NOTRACK in i686/memcmp.S
X-Git-Tag: glibc-2.28~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e119cd582;p=thirdparty%2Fglibc.git

i386: Use _CET_NOTRACK in i686/memcmp.S

	* sysdeps/i386/i686/memcmp.S (memcmp): Add _CET_NOTRACK before
	indirect jump to jump table.
---

diff --git a/ChangeLog b/ChangeLog
index d44a62ae6c9..dba41dbde8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/i386/i686/memcmp.S (memcmp): Add _CET_NOTRACK before
+	indirect jump to jump table.
+
 2018-07-18  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/x86_64/multiarch/memcpy-ssse3.S
diff --git a/sysdeps/i386/i686/memcmp.S b/sysdeps/i386/i686/memcmp.S
index a0bc9ec97c1..3259076cd7e 100644
--- a/sysdeps/i386/i686/memcmp.S
+++ b/sysdeps/i386/i686/memcmp.S
@@ -80,7 +80,7 @@ L(not_1):
 	LOAD_JUMP_TABLE_ENTRY (L(table_32bytes), %ecx)
 	addl	%ecx, %edx
 	addl	%ecx, %esi
-	jmp	*%ebx
+	_CET_NOTRACK jmp *%ebx
 
 	ALIGN (4)
 L(28bytes):
@@ -326,7 +326,7 @@ L(32bytesormore):
 	LOAD_JUMP_TABLE_ENTRY (L(table_32bytes), %ecx)
 	addl	%ecx, %edx
 	addl	%ecx, %esi
-	jmp	*%ebx
+	_CET_NOTRACK jmp *%ebx
 
 L(load_ecx_28):
 	addl	$0x4, %edx