about summary refs log tree commit diff
path: root/nss
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2019-01-21 11:36:36 -0800
committerH.J. Lu <hjl.tools@gmail.com>2019-01-21 11:36:47 -0800
commit5165de69c0908e28a380cbd4bb054e55ea4abc95 (patch)
tree6be5f660262a283870db3ca16d7f07210859b58f /nss
parentc7c54f65b080affb87a1513dee449c8ad6143c8b (diff)
downloadglibc-5165de69c0908e28a380cbd4bb054e55ea4abc95.tar.gz
glibc-5165de69c0908e28a380cbd4bb054e55ea4abc95.tar.xz
glibc-5165de69c0908e28a380cbd4bb054e55ea4abc95.zip
x86-64 strnlen/wcsnlen: 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 strnlen/wcsnlen 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/multiarch/strlen-avx2.S: Use RSI_LP for length.
	Clear the upper 32 bits of RSI register.
	* sysdeps/x86_64/strlen.S: Use RSI_LP for length.
	* sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-strnlen
	and tst-size_t-wcsnlen.
	* sysdeps/x86_64/x32/tst-size_t-strnlen.c: New file.
	* sysdeps/x86_64/x32/tst-size_t-wcsnlen.c: Likewise.
Diffstat (limited to 'nss')
0 files changed, 0 insertions, 0 deletions