135af16dad
Upstream commit: aa601d024424c40ae9a69b0c4e394a70ea0570c8 Several upstream commits change NEWS only (changes we do not backport) or have been backported before, which is why there are gaps. - x86: Use CHECK_FEATURE_PRESENT to check HLE [BZ #27398] - x86: Filter out more Intel CPUs for TSX [BZ #27398] - Fix glibc 2.34 ABI omission (missing GLIBC_2.34 in dynamic loader) - x86: Fix __wcsncmp_evex in strcmp-evex.S [BZ# 28755] - x86: Fix __wcsncmp_avx2 in strcmp-avx2.S [BZ# 28755]
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
commit b50d5b746cc0af5ad52164dcb0d3628f08b05a0d
|
|
Author: Noah Goldstein <goldstein.w.n@gmail.com>
|
|
Date: Sun Jan 9 16:02:21 2022 -0600
|
|
|
|
x86: Fix __wcsncmp_avx2 in strcmp-avx2.S [BZ# 28755]
|
|
|
|
Fixes [BZ# 28755] for wcsncmp by redirecting length >= 2^56 to
|
|
__wcscmp_avx2. For x86_64 this covers the entire address range so any
|
|
length larger could not possibly be used to bound `s1` or `s2`.
|
|
|
|
test-strcmp, test-strncmp, test-wcscmp, and test-wcsncmp all pass.
|
|
|
|
Signed-off-by: Noah Goldstein <goldstein.w.n@gmail.com>
|
|
(cherry picked from commit ddf0992cf57a93200e0c782e2a94d0733a5a0b87)
|
|
|
|
diff --git a/sysdeps/x86_64/multiarch/strcmp-avx2.S b/sysdeps/x86_64/multiarch/strcmp-avx2.S
|
|
index 40333010a65650f9..3dfcb1bf803cf9ec 100644
|
|
--- a/sysdeps/x86_64/multiarch/strcmp-avx2.S
|
|
+++ b/sysdeps/x86_64/multiarch/strcmp-avx2.S
|
|
@@ -87,6 +87,16 @@ ENTRY (STRCMP)
|
|
je L(char0)
|
|
jb L(zero)
|
|
# ifdef USE_AS_WCSCMP
|
|
+# ifndef __ILP32__
|
|
+ movq %rdx, %rcx
|
|
+ /* Check if length could overflow when multiplied by
|
|
+ sizeof(wchar_t). Checking top 8 bits will cover all potential
|
|
+ overflow cases as well as redirect cases where its impossible to
|
|
+ length to bound a valid memory region. In these cases just use
|
|
+ 'wcscmp'. */
|
|
+ shrq $56, %rcx
|
|
+ jnz __wcscmp_avx2
|
|
+# endif
|
|
/* Convert units: from wide to byte char. */
|
|
shl $2, %RDX_LP
|
|
# endif
|