qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 ddf0992cf5)
This commit is contained in:
Noah Goldstein 2022-01-09 16:02:21 -06:00 committed by H.J. Lu
parent 83d6f50313
commit 65df4053a4
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sysdeps/x86_64/multiarch/strcmp-avx2.S
View File

@ -83,6 +83,16 @@ ENTRY (STRCMP)
je L(char0) je L(char0)
jb L(zero) jb L(zero)
# ifdef USE_AS_WCSCMP # 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. */ /* Convert units: from wide to byte char. */
shl $2, %RDX_LP shl $2, %RDX_LP
# endif # endif