]> git.ipfire.org Git - thirdparty/glibc.git/commit
x86-64 strnlen/wcsnlen: Properly handle the length parameter [BZ #24097]
authorH.J. Lu <hjl.tools@gmail.com>
Fri, 1 Feb 2019 20:24:08 +0000 (12:24 -0800)
committerH.J. Lu <hjl.tools@gmail.com>
Fri, 1 Feb 2019 20:24:16 +0000 (12:24 -0800)
commitd09b11cbe57c6434813ead18ff128012230bb614
tree140f9bba5176841ffdc09e5fa557d6708491f13a
parent07a42c0effbea499a2ed88e19e7a8bd6f1653f48
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.

(cherry picked from commit 5165de69c0908e28a380cbd4bb054e55ea4abc95)
ChangeLog
sysdeps/x86_64/multiarch/strlen-avx2.S
sysdeps/x86_64/strlen.S
sysdeps/x86_64/x32/Makefile
sysdeps/x86_64/x32/tst-size_t-strnlen.c [new file with mode: 0644]
sysdeps/x86_64/x32/tst-size_t-wcsnlen.c [new file with mode: 0644]