diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2019-01-21 11:23:59 -0800 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2019-01-21 11:24:13 -0800 |
commit | 97700a34f36721b11a754cf37a1cc40695ece1fd (patch) | |
tree | 026802789792449adc9de3532ee8b10685086401 /sysdeps/x86_64/x32/Makefile | |
parent | 6ca53a2453598804a2559a548a08424fca96434a (diff) | |
download | glibc-97700a34f36721b11a754cf37a1cc40695ece1fd.tar.gz glibc-97700a34f36721b11a754cf37a1cc40695ece1fd.tar.xz glibc-97700a34f36721b11a754cf37a1cc40695ece1fd.zip |
x86-64 memchr/wmemchr: Properly handle the length parameter [BZ# 24097]
On x32, the size_t parameter may be passed in the lower 32 bits of a 64-bit register with the non-zero upper 32 bits. The string/memory functions written in assembly can only use the lower 32 bits of a 64-bit register as length or must clear the upper 32 bits before using the full 64-bit register for length. This pach fixes memchr/wmemchr for x32. Tested on x86-64 and x32. On x86-64, libc.so is the same with and withou the fix. [BZ# 24097] CVE-2019-6488 * sysdeps/x86_64/memchr.S: Use RDX_LP for length. Clear the upper 32 bits of RDX register. * sysdeps/x86_64/multiarch/memchr-avx2.S: Likewise. * sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-memchr and tst-size_t-wmemchr. * sysdeps/x86_64/x32/test-size_t.h: New file. * sysdeps/x86_64/x32/tst-size_t-memchr.c: Likewise. * sysdeps/x86_64/x32/tst-size_t-wmemchr.c: Likewise.
Diffstat (limited to 'sysdeps/x86_64/x32/Makefile')
-rw-r--r-- | sysdeps/x86_64/x32/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sysdeps/x86_64/x32/Makefile b/sysdeps/x86_64/x32/Makefile index f2ebc24fb0..7d528889c6 100644 --- a/sysdeps/x86_64/x32/Makefile +++ b/sysdeps/x86_64/x32/Makefile @@ -4,3 +4,11 @@ ifeq ($(subdir),math) # 64-bit llround. Add -fno-builtin-lround to silence the compiler. CFLAGS-s_llround.c += -fno-builtin-lround endif + +ifeq ($(subdir),string) +tests += tst-size_t-memchr +endif + +ifeq ($(subdir),wcsmbs) +tests += tst-size_t-wmemchr +endif |