94084c
commit 08beb3a3f4f46e306fffe184a08c5664bf0e13d6
94084c
Author: Noah Goldstein <goldstein.w.n@gmail.com>
94084c
Date:   Sun Jan 9 16:02:28 2022 -0600
94084c
94084c
    x86: Fix __wcsncmp_evex in strcmp-evex.S [BZ# 28755]
94084c
    
94084c
    Fixes [BZ# 28755] for wcsncmp by redirecting length >= 2^56 to
94084c
    __wcscmp_evex. For x86_64 this covers the entire address range so any
94084c
    length larger could not possibly be used to bound `s1` or `s2`.
94084c
    
94084c
    test-strcmp, test-strncmp, test-wcscmp, and test-wcsncmp all pass.
94084c
    
94084c
    Signed-off-by: Noah Goldstein <goldstein.w.n@gmail.com>
94084c
    (cherry picked from commit 7e08db3359c86c94918feb33a1182cd0ff3bb10b)
94084c
94084c
diff --git a/sysdeps/x86_64/multiarch/strcmp-evex.S b/sysdeps/x86_64/multiarch/strcmp-evex.S
94084c
index 459eeed09f5e276e..d5aa6daa46c7ed25 100644
94084c
--- a/sysdeps/x86_64/multiarch/strcmp-evex.S
94084c
+++ b/sysdeps/x86_64/multiarch/strcmp-evex.S
94084c
@@ -97,6 +97,16 @@ ENTRY (STRCMP)
94084c
 	je	L(char0)
94084c
 	jb	L(zero)
94084c
 #  ifdef USE_AS_WCSCMP
94084c
+#  ifndef __ILP32__
94084c
+	movq	%rdx, %rcx
94084c
+	/* Check if length could overflow when multiplied by
94084c
+	   sizeof(wchar_t). Checking top 8 bits will cover all potential
94084c
+	   overflow cases as well as redirect cases where its impossible to
94084c
+	   length to bound a valid memory region. In these cases just use
94084c
+	   'wcscmp'.  */
94084c
+	shrq	$56, %rcx
94084c
+	jnz	__wcscmp_evex
94084c
+#  endif
94084c
 	/* Convert units: from wide to byte char.  */
94084c
 	shl	$2, %RDX_LP
94084c
 #  endif