i386: Use _CET_NOTRACK in memset-sse2.S

	* sysdeps/i386/i686/multiarch/memset-sse2.S
	(BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump
	to jump table.

diff --git a/ChangeLog b/ChangeLog
index dba41dbde8e4956ca35a822829803cc115f5ae2e..b466774bd77341791631ac84bffd9a88b62d92e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/i386/i686/multiarch/memset-sse2.S
+       (BRANCH_TO_JMPTBL_ENTRY): Add _CET_NOTRACK before indirect jump
+       to jump table.
+
 2018-07-18  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/i386/i686/memcmp.S (memcmp): Add _CET_NOTRACK before

diff --git a/sysdeps/i386/i686/multiarch/memset-sse2.S b/sysdeps/i386/i686/multiarch/memset-sse2.S
index 8869c80f252d3ec8b9bd4ffa1a3c4d149a4917f1..5c9eba1e65a648e9c077538b844490b0a1f138f7 100644 (file)
--- a/sysdeps/i386/i686/multiarch/memset-sse2.S
+++ b/sysdeps/i386/i686/multiarch/memset-sse2.S
@@ -63,7 +63,7 @@
     add                (%ebx,%ecx,4), %ebx;                            \
     add                %ecx, %edx;                                     \
     /* We loaded the jump table and adjusted EDX. Go.  */      \
-    jmp                *%ebx
+    _CET_NOTRACK jmp   *%ebx
 #else
 # define ENTRANCE
 # define RETURN_END    ret
@@ -75,7 +75,7 @@
    absolute offsets.  */
 # define BRANCH_TO_JMPTBL_ENTRY(TABLE)                         \
     add                %ecx, %edx;                                     \
-    jmp                *TABLE(,%ecx,4)
+    _CET_NOTRACK jmp *TABLE(,%ecx,4)
 #endif
 
        .section .text.sse2,"ax",@progbits