diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2019-02-01 12:24:08 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2019-02-02 05:44:06 -0800 |
| commit | f728a542bf8f9f30709f8d16a5cfceaa060956ce (patch) | |
| tree | 64d619fbe2bc3ce143ecfe2615971e643cd79d9b /sysdeps/x86_64/x32/Makefile | |
| parent | 3a84199109d2baedd76849fa6743e773852ecccf (diff) | |
| download | glibc-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 'sysdeps/x86_64/x32/Makefile')
| -rw-r--r-- | sysdeps/x86_64/x32/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/x86_64/x32/Makefile b/sysdeps/x86_64/x32/Makefile index ae0606c703..35d41d9bae 100644 --- a/sysdeps/x86_64/x32/Makefile +++ b/sysdeps/x86_64/x32/Makefile @@ -8,7 +8,7 @@ endif ifeq ($(subdir),string) tests += tst-size_t-memchr tst-size_t-memcmp tst-size_t-memcpy \ tst-size_t-memrchr tst-size_t-memset tst-size_t-strncasecmp \ - tst-size_t-strncmp tst-size_t-strncpy + tst-size_t-strncmp tst-size_t-strncpy tst-size_t-strnlen endif ifeq ($(subdir),wcsmbs) |