diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2019-01-21 11:36:36 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2019-01-21 11:36:47 -0800 |
| commit | 5165de69c0908e28a380cbd4bb054e55ea4abc95 (patch) | |
| tree | 6be5f660262a283870db3ca16d7f07210859b58f /sysdeps/x86_64/x32/tst-size_t-wcsnlen.c | |
| parent | c7c54f65b080affb87a1513dee449c8ad6143c8b (diff) | |
| download | glibc-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 'sysdeps/x86_64/x32/tst-size_t-wcsnlen.c')
| -rw-r--r-- | sysdeps/x86_64/x32/tst-size_t-wcsnlen.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/sysdeps/x86_64/x32/tst-size_t-wcsnlen.c b/sysdeps/x86_64/x32/tst-size_t-wcsnlen.c new file mode 100644 index 0000000000..093b4bbe1b --- /dev/null +++ b/sysdeps/x86_64/x32/tst-size_t-wcsnlen.c @@ -0,0 +1,20 @@ +/* Test wcsnlen with size_t in the lower 32 bits of 64-bit register. + Copyright (C) 2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#define WIDE 1 +#include "tst-size_t-strnlen.c" |