about summary refs log tree commit diff
path: root/sysdeps/x86_64/x32/Makefile
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2019-01-21 11:29:58 -0800
committerH.J. Lu <hjl.tools@gmail.com>2019-01-21 11:30:12 -0800
commitecd8b842cf37ea112e59cd9085ff1f1b6e208ae0 (patch)
tree66fccd2376120240e84e0e41a5cadc21ec4e077d /sysdeps/x86_64/x32/Makefile
parent231c56760c1e2ded21ad96bbb860b1f08c556c7a (diff)
downloadglibc-ecd8b842cf37ea112e59cd9085ff1f1b6e208ae0.tar.gz
glibc-ecd8b842cf37ea112e59cd9085ff1f1b6e208ae0.tar.xz
glibc-ecd8b842cf37ea112e59cd9085ff1f1b6e208ae0.zip
x86-64 memrchr: 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 memrchr 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/memrchr.S: Use RDX_LP for length.
	* sysdeps/x86_64/multiarch/memrchr-avx2.S: Likewise.
	* sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-memrchr.
	* sysdeps/x86_64/x32/tst-size_t-memrchr.c: New file.
Diffstat (limited to 'sysdeps/x86_64/x32/Makefile')
-rw-r--r--sysdeps/x86_64/x32/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/x86_64/x32/Makefile b/sysdeps/x86_64/x32/Makefile
index 2fe1e5ac5a..e99dbd7c86 100644
--- a/sysdeps/x86_64/x32/Makefile
+++ b/sysdeps/x86_64/x32/Makefile
@@ -6,7 +6,8 @@ CFLAGS-s_llround.c += -fno-builtin-lround
 endif
 
 ifeq ($(subdir),string)
-tests += tst-size_t-memchr tst-size_t-memcmp tst-size_t-memcpy
+tests += tst-size_t-memchr tst-size_t-memcmp tst-size_t-memcpy \
+	 tst-size_t-memrchr
 endif
 
 ifeq ($(subdir),wcsmbs)