about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2019-02-01 12:24:08 -0800
committerH.J. Lu <hjl.tools@gmail.com>2019-02-02 05:44:06 -0800
commitf728a542bf8f9f30709f8d16a5cfceaa060956ce (patch)
tree64d619fbe2bc3ce143ecfe2615971e643cd79d9b /ChangeLog
parent3a84199109d2baedd76849fa6743e773852ecccf (diff)
downloadglibc-f728a542bf8f9f30709f8d16a5cfceaa060956ce.tar.gz
glibc-f728a542bf8f9f30709f8d16a5cfceaa060956ce.tar.xz
glibc-f728a542bf8f9f30709f8d16a5cfceaa060956ce.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/strlen.S: Use RSI_LP for length.
	* sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-strnlen.
	* sysdeps/x86_64/x32/tst-size_t-strnlen.c: New file.

(cherry picked from commit 5165de69c0908e28a380cbd4bb054e55ea4abc95)
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c5596ac7b7..54a9d179ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 
 	[BZ #24097]
 	CVE-2019-6488
+	* sysdeps/x86_64/strlen.S: Use RSI_LP for length.
+	* sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-strnlen.
+	* sysdeps/x86_64/x32/tst-size_t-strnlen.c: New file.
+
+2019-02-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #24097]
+	CVE-2019-6488
 	* sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S: Use RDX_LP
 	for length.
 	* sysdeps/x86_64/multiarch/strcpy-ssse3.S: Likewise.