diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2019-02-01 12:22:33 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2019-02-01 12:22:42 -0800 |
| commit | c678b802331360e018c626db685ada99424a8749 (patch) | |
| tree | 1c3e0909ea844b67c80f8a6fe4fd9ae34e28727a /sysdeps/x86_64/x32/Makefile | |
| parent | 17fc7debccbf7efeaead08073b5ae23ba5197a43 (diff) | |
| download | glibc-c678b802331360e018c626db685ada99424a8749.tar.gz | |
x86-64 strncmp family: 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 the strncmp family 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/strcmp-avx2.S: Use RDX_LP for length.
* sysdeps/x86_64/multiarch/strcmp-sse42.S: Likewise.
* sysdeps/x86_64/strcmp.S: Likewise.
* sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-strncasecmp,
tst-size_t-strncmp and tst-size_t-wcsncmp.
* sysdeps/x86_64/x32/tst-size_t-strncasecmp.c: New file.
* sysdeps/x86_64/x32/tst-size_t-strncmp.c: Likewise.
* sysdeps/x86_64/x32/tst-size_t-wcsncmp.c: Likewise.
(cherry picked from commit ee915088a0231cd421054dbd8abab7aadf331153)
Diffstat (limited to 'sysdeps/x86_64/x32/Makefile')
| -rw-r--r-- | sysdeps/x86_64/x32/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/x86_64/x32/Makefile b/sysdeps/x86_64/x32/Makefile index 98bd9ae9cd..db30283977 100644 --- a/sysdeps/x86_64/x32/Makefile +++ b/sysdeps/x86_64/x32/Makefile @@ -7,9 +7,11 @@ 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-memrchr tst-size_t-memset tst-size_t-strncasecmp \ + tst-size_t-strncmp endif ifeq ($(subdir),wcsmbs) -tests += tst-size_t-wmemchr tst-size_t-wmemcmp tst-size_t-wmemset +tests += tst-size_t-wmemchr tst-size_t-wmemcmp tst-size_t-wmemset \ + tst-size_t-wcsncmp endif |