mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-03 02:11:08 +00:00
3f635fb433
Since the size argument is unsigned. we should use unsigned Jcc instructions, instead of signed, to check size. Tested on x86-64 and x32, with and without --disable-multi-arch. [BZ #24155] CVE-2019-7309 * NEWS: Updated for CVE-2019-7309. * sysdeps/x86_64/memcmp.S: Use RDX_LP for size. Clear the upper 32 bits of RDX register for x32. Use unsigned Jcc instructions, instead of signed. * sysdeps/x86_64/x32/Makefile (tests): Add tst-size_t-memcmp-2. * sysdeps/x86_64/x32/tst-size_t-memcmp-2.c: New test.
80 lines
1.9 KiB
C
80 lines
1.9 KiB
C
/* Test memcmp 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 TEST_MAIN
|
|
#ifdef WIDE
|
|
# define TEST_NAME "wmemcmp"
|
|
#else
|
|
# define TEST_NAME "memcmp"
|
|
#endif
|
|
|
|
#include "test-size_t.h"
|
|
|
|
#ifdef WIDE
|
|
# include <inttypes.h>
|
|
# include <wchar.h>
|
|
|
|
# define MEMCMP wmemcmp
|
|
# define CHAR wchar_t
|
|
#else
|
|
# define MEMCMP memcmp
|
|
# define CHAR char
|
|
#endif
|
|
|
|
IMPL (MEMCMP, 1)
|
|
|
|
typedef int (*proto_t) (const CHAR *, const CHAR *, size_t);
|
|
|
|
static int
|
|
__attribute__ ((noinline, noclone))
|
|
do_memcmp (parameter_t a, parameter_t b)
|
|
{
|
|
return CALL (&b, a.p, b.p, a.len);
|
|
}
|
|
|
|
static int
|
|
test_main (void)
|
|
{
|
|
test_init ();
|
|
|
|
parameter_t dest = { { page_size / sizeof (CHAR) }, buf1 };
|
|
parameter_t src = { { 0 }, buf2 };
|
|
|
|
memcpy (buf1, buf2, page_size);
|
|
|
|
CHAR *p = (CHAR *) buf1;
|
|
p[page_size / sizeof (CHAR) - 1] = (CHAR) 1;
|
|
|
|
int ret = 0;
|
|
FOR_EACH_IMPL (impl, 0)
|
|
{
|
|
src.fn = impl->fn;
|
|
int res = do_memcmp (dest, src);
|
|
if (res >= 0)
|
|
{
|
|
error (0, 0, "Wrong result in function %s: %i >= 0",
|
|
impl->name, res);
|
|
ret = 1;
|
|
}
|
|
}
|
|
|
|
return ret ? EXIT_FAILURE : EXIT_SUCCESS;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|