mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 09:01:07 +00:00
51aeab9a36
Starting with commit
b2c474f8de
"x86: Fix strncat-avx2.S reading past length [BZ #30065]"
Building on s390 the test fails due warnings like:
In function ‘do_one_test’,
inlined from ‘do_overflow_tests’ at test-strncat.c:175:7:
test-strncat.c:31:18: error: ‘strnlen’ specified bound [4294966546, 4294967295] exceeds maximum object size 2147483647 [-Werror=stringop-overflow=]
31 | # define STRNLEN strnlen
| ^
test-strncat.c:83:16: note: in expansion of macro ‘STRNLEN’
83 | size_t len = STRNLEN (src, n);
| ^~~~~~~
In all werror cases, the call to strnlen (.., SIZE_MAX) is inlined.
Therefore this patch just marks the do_one_test function as noinline.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
403 lines
10 KiB
C
403 lines
10 KiB
C
/* Test strncat functions.
|
|
Copyright (C) 2011-2023 Free Software Foundation, Inc.
|
|
|
|
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
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#define TEST_MAIN
|
|
#ifndef WIDE
|
|
# define TEST_NAME "strncat"
|
|
#else
|
|
# define TEST_NAME "wcsncat"
|
|
#endif /* WIDE */
|
|
#include "test-string.h"
|
|
|
|
#ifndef WIDE
|
|
# define STRNCAT strncat
|
|
# define CHAR char
|
|
# define UCHAR unsigned char
|
|
# define SIMPLE_STRNCAT simple_strncat
|
|
# define STRNLEN strnlen
|
|
# define STRLEN strlen
|
|
# define MEMSET memset
|
|
# define MEMCPY memcpy
|
|
# define MEMCMP memcmp
|
|
# define BIG_CHAR CHAR_MAX
|
|
# define SMALL_CHAR 127
|
|
#else
|
|
# include <wchar.h>
|
|
# define STRNCAT wcsncat
|
|
# define CHAR wchar_t
|
|
# define UCHAR wchar_t
|
|
# define SIMPLE_STRNCAT simple_wcsncat
|
|
# define STRNLEN wcsnlen
|
|
# define STRLEN wcslen
|
|
# define MEMSET wmemset
|
|
# define MEMCPY wmemcpy
|
|
# define MEMCMP wmemcmp
|
|
# define BIG_CHAR WCHAR_MAX
|
|
# define SMALL_CHAR 1273
|
|
#endif /* WIDE */
|
|
|
|
typedef CHAR *(*proto_t) (CHAR *, const CHAR *, size_t);
|
|
|
|
IMPL (STRNCAT, 2)
|
|
|
|
/* Naive implementation to verify results. */
|
|
CHAR *
|
|
SIMPLE_STRNCAT (CHAR *dst, const CHAR *src, size_t n)
|
|
{
|
|
CHAR *ret = dst;
|
|
while (*dst++ != '\0');
|
|
--dst;
|
|
while (n--)
|
|
if ((*dst++ = *src++) == '\0')
|
|
return ret;
|
|
*dst = '\0';
|
|
return ret;
|
|
}
|
|
|
|
static void
|
|
__attribute__((noinline))
|
|
do_one_test (impl_t *impl, CHAR *dst, const CHAR *src, size_t n)
|
|
{
|
|
size_t k = STRLEN (dst);
|
|
if (CALL (impl, dst, src, n) != dst)
|
|
{
|
|
error (0, 0, "Wrong result in function %s %p != %p", impl->name,
|
|
CALL (impl, dst, src, n), dst);
|
|
ret = 1;
|
|
return;
|
|
}
|
|
|
|
size_t len = STRNLEN (src, n);
|
|
if (MEMCMP (dst + k, src, len + 1 > n ? n : len + 1) != 0)
|
|
{
|
|
error (0, 0, "Incorrect concatenation in function %s",
|
|
impl->name);
|
|
ret = 1;
|
|
return;
|
|
}
|
|
if (n < len && dst[k + n] != '\0')
|
|
{
|
|
error (0, 0, "There is no zero in the end of output string in %s",
|
|
impl->name);
|
|
ret = 1;
|
|
return;
|
|
}
|
|
}
|
|
|
|
static void
|
|
do_test_src_no_nullterm_bz30065 (void)
|
|
{
|
|
/* NB: "src does not need to be null-terminated if it contains n or more
|
|
* bytes." */
|
|
CHAR *s1, *s2;
|
|
size_t bound = page_size / sizeof (CHAR);
|
|
s1 = (CHAR *) (buf1 + BUF1PAGES * page_size);
|
|
s2 = (CHAR *) buf2;
|
|
MEMSET (s1 - bound, -1, bound);
|
|
for (size_t n = 0; n < bound; ++n)
|
|
{
|
|
FOR_EACH_IMPL (impl, 0)
|
|
{
|
|
s2[0] = '\0';
|
|
do_one_test (impl, s2, s1 - n, n);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
do_test (size_t align1, size_t align2, size_t len1, size_t len2,
|
|
size_t n, int max_char)
|
|
{
|
|
size_t i;
|
|
CHAR *s1, *s2;
|
|
|
|
align1 &= 7;
|
|
if ((align1 + len1) * sizeof (CHAR) >= page_size)
|
|
return;
|
|
if ((align1 + n) * sizeof (CHAR) > page_size)
|
|
return;
|
|
align2 &= 7;
|
|
if ((align2 + len1 + len2) * sizeof (CHAR) >= page_size)
|
|
return;
|
|
if ((align2 + len1 + n) * sizeof (CHAR) > page_size)
|
|
return;
|
|
s1 = (CHAR *) (buf1) + align1;
|
|
s2 = (CHAR *) (buf2) + align2;
|
|
|
|
for (i = 0; i < len1; ++i)
|
|
s1[i] = 32 + 23 * i % (max_char - 32);
|
|
s1[len1] = '\0';
|
|
|
|
for (i = 0; i < len2; i++)
|
|
s2[i] = 32 + 23 * i % (max_char - 32);
|
|
|
|
FOR_EACH_IMPL (impl, 0)
|
|
{
|
|
s2[len2] = '\0';
|
|
do_one_test (impl, s2, s1, n);
|
|
}
|
|
}
|
|
|
|
static void
|
|
do_overflow_tests (void)
|
|
{
|
|
size_t i, j, len;
|
|
const size_t one = 1;
|
|
CHAR *s1, *s2;
|
|
uintptr_t s1_addr;
|
|
s1 = (CHAR *) buf1;
|
|
s2 = (CHAR *) buf2;
|
|
s1_addr = (uintptr_t)s1;
|
|
for (j = 0; j < 200; ++j)
|
|
s2[j] = 32 + 23 * j % (BIG_CHAR - 32);
|
|
s2[200] = 0;
|
|
for (i = 0; i < 750; ++i) {
|
|
for (j = 0; j < i; ++j)
|
|
s1[j] = 32 + 23 * j % (BIG_CHAR - 32);
|
|
s1[i] = '\0';
|
|
|
|
FOR_EACH_IMPL (impl, 0)
|
|
{
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, SIZE_MAX - i);
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, i - s1_addr);
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, -s1_addr - i);
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, SIZE_MAX - s1_addr - i);
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, SIZE_MAX - s1_addr + i);
|
|
}
|
|
|
|
len = 0;
|
|
for (j = 8 * sizeof(size_t) - 1; j ; --j)
|
|
{
|
|
len |= one << j;
|
|
FOR_EACH_IMPL (impl, 0)
|
|
{
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, len - i);
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, len + i);
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, len - s1_addr - i);
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, len - s1_addr + i);
|
|
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, ~len - i);
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, ~len + i);
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, ~len - s1_addr - i);
|
|
s2[200] = '\0';
|
|
do_one_test (impl, s2, s1, ~len - s1_addr + i);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
do_random_tests (void)
|
|
{
|
|
size_t i, j, n, align1, align2, len1, len2, N;
|
|
UCHAR *p1 = (UCHAR *) (buf1 + page_size) - 512;
|
|
UCHAR *p2 = (UCHAR *) (buf2 + page_size) - 512;
|
|
UCHAR *p3 = (UCHAR *) buf1;
|
|
UCHAR *res;
|
|
fprintf (stdout, "Number of iterations in random test = %zd\n",
|
|
ITERATIONS);
|
|
for (n = 0; n < ITERATIONS; n++)
|
|
{
|
|
N = random () & 255;
|
|
align1 = random () & 31;
|
|
if (random () & 1)
|
|
align2 = random () & 31;
|
|
else
|
|
align2 = align1 + (random () & 24);
|
|
len1 = random () & 511;
|
|
if (len1 + align2 > 512)
|
|
len2 = random () & 7;
|
|
else
|
|
len2 = (512 - len1 - align2) * (random () & (1024 * 1024 - 1))
|
|
/ (1024 * 1024);
|
|
j = align1;
|
|
if (align2 + len2 > j)
|
|
j = align2 + len2;
|
|
if (len1 + j >= 511)
|
|
len1 = 510 - j - (random () & 7);
|
|
if (len1 >= 512)
|
|
len1 = 0;
|
|
if (align1 + len1 < 512 - 8)
|
|
{
|
|
j = 510 - align1 - len1 - (random () & 31);
|
|
if (j > 0 && j < 512)
|
|
align1 += j;
|
|
}
|
|
j = len1 + align1 + 64;
|
|
if (j > 512)
|
|
j = 512;
|
|
for (i = 0; i < j; i++)
|
|
{
|
|
if (i == len1 + align1)
|
|
p1[i] = 0;
|
|
else
|
|
{
|
|
p1[i] = random () & BIG_CHAR;
|
|
if (i >= align1 && i < len1 + align1 && !p1[i])
|
|
p1[i] = (random () & SMALL_CHAR) + 3;
|
|
}
|
|
}
|
|
for (i = 0; i < len2; i++)
|
|
{
|
|
p3[i] = random () & BIG_CHAR;
|
|
if (!p3[i])
|
|
p3[i] = (random () & SMALL_CHAR) + 3;
|
|
}
|
|
p3[len2] = 0;
|
|
|
|
FOR_EACH_IMPL (impl, 1)
|
|
{
|
|
MEMSET (p2 - 64, '\1', align2 + 64);
|
|
MEMSET (p2 + align2 + len2 + 1, '\1', 512 - align2 - len2 - 1);
|
|
MEMCPY (p2 + align2, p3, len2 + 1);
|
|
res = (UCHAR *) CALL (impl, (CHAR *) (p2 + align2),
|
|
(CHAR *) (p1 + align1), N);
|
|
if (res != p2 + align2)
|
|
{
|
|
error (0, 0, "Iteration %zd - wrong result in function %s "
|
|
"(%zd, %zd, %zd, %zd, %zd) %p != %p",
|
|
n, impl->name, align1, align2, len1, len2, N,
|
|
res, p2 + align2);
|
|
ret = 1;
|
|
}
|
|
for (j = 0; j < align2 + 64; ++j)
|
|
{
|
|
if (p2[j - 64] != '\1')
|
|
{
|
|
error (0, 0, "Iteration %zd - garbage before dst, %s "
|
|
"%zd, %zd, %zd, %zd, %zd)",
|
|
n, impl->name, align1, align2, len1, len2, N);
|
|
ret = 1;
|
|
break;
|
|
}
|
|
}
|
|
if (MEMCMP (p2 + align2, p3, len2))
|
|
{
|
|
error (0, 0, "Iteration %zd - garbage in string before, %s "
|
|
"(%zd, %zd, %zd, %zd, %zd)",
|
|
n, impl->name, align1, align2, len1, len2, N);
|
|
ret = 1;
|
|
}
|
|
|
|
if ((len1 + 1) > N)
|
|
j = align2 + N + 1 + len2;
|
|
else
|
|
j = align2 + len1 + 1 + len2;
|
|
for (; j < 512; ++j)
|
|
{
|
|
if (p2[j] != '\1')
|
|
{
|
|
error (0, 0, "Iteration %zd - garbage after, %s "
|
|
"(%zd, %zd, %zd, %zd, %zd)",
|
|
n, impl->name, align1, align2, len1, len2, N);
|
|
ret = 1;
|
|
break;
|
|
}
|
|
}
|
|
if (len1 + 1 > N)
|
|
{
|
|
if (p2[align2 + N + len2] != '\0')
|
|
{
|
|
error (0, 0, "Iteration %zd - there is no zero at the "
|
|
"end of output string, %s (%zd, %zd, %zd, %zd, %zd)",
|
|
n, impl->name, align1, align2, len1, len2, N);
|
|
ret = 1;
|
|
}
|
|
}
|
|
if (MEMCMP (p1 + align1, p2 + align2 + len2,
|
|
(len1 + 1) > N ? N : len1 + 1))
|
|
{
|
|
error (0, 0, "Iteration %zd - different strings, %s "
|
|
"(%zd, %zd, %zd, %zd, %zd)",
|
|
n, impl->name, align1, align2, len1, len2, N);
|
|
ret = 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
int
|
|
test_main (void)
|
|
{
|
|
size_t i, n;
|
|
|
|
test_init ();
|
|
|
|
printf ("%28s", "");
|
|
FOR_EACH_IMPL (impl, 0)
|
|
printf ("\t%s", impl->name);
|
|
putchar ('\n');
|
|
|
|
for (n = 2; n <= 2048; n*=4)
|
|
{
|
|
do_test (0, 2, 2, 2, n, SMALL_CHAR);
|
|
do_test (0, 0, 4, 4, n, SMALL_CHAR);
|
|
do_test (4, 0, 4, 4, n, BIG_CHAR);
|
|
do_test (0, 0, 8, 8, n, SMALL_CHAR);
|
|
do_test (0, 8, 8, 8, n, SMALL_CHAR);
|
|
|
|
do_test (0, 2, 2, 2, SIZE_MAX, SMALL_CHAR);
|
|
do_test (0, 0, 4, 4, SIZE_MAX, SMALL_CHAR);
|
|
do_test (4, 0, 4, 4, SIZE_MAX, BIG_CHAR);
|
|
do_test (0, 0, 8, 8, SIZE_MAX, SMALL_CHAR);
|
|
do_test (0, 8, 8, 8, SIZE_MAX, SMALL_CHAR);
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
{
|
|
do_test (0, 0, 8 << i, 8 << i, n, SMALL_CHAR);
|
|
do_test (8 - i, 2 * i, 8 << i, 8 << i, n, SMALL_CHAR);
|
|
do_test (0, 0, 8 << i, 2 << i, n, SMALL_CHAR);
|
|
do_test (8 - i, 2 * i, 8 << i, 2 << i, n, SMALL_CHAR);
|
|
|
|
do_test (0, 0, 8 << i, 8 << i, SIZE_MAX, SMALL_CHAR);
|
|
do_test (8 - i, 2 * i, 8 << i, 8 << i, SIZE_MAX, SMALL_CHAR);
|
|
do_test (0, 0, 8 << i, 2 << i, SIZE_MAX, SMALL_CHAR);
|
|
do_test (8 - i, 2 * i, 8 << i, 2 << i, SIZE_MAX, SMALL_CHAR);
|
|
}
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
{
|
|
do_test (i, 2 * i, 8 << i, 1, n, SMALL_CHAR);
|
|
do_test (2 * i, i, 8 << i, 1, n, BIG_CHAR);
|
|
do_test (i, i, 8 << i, 10, n, SMALL_CHAR);
|
|
|
|
do_test (i, 2 * i, 8 << i, 1, SIZE_MAX, SMALL_CHAR);
|
|
do_test (2 * i, i, 8 << i, 1, SIZE_MAX, BIG_CHAR);
|
|
do_test (i, i, 8 << i, 10, SIZE_MAX, SMALL_CHAR);
|
|
}
|
|
}
|
|
|
|
do_random_tests ();
|
|
do_overflow_tests ();
|
|
do_test_src_no_nullterm_bz30065 ();
|
|
return ret;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|