From patchwork Thu Jul 27 17:51:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Pandey X-Patchwork-Id: 1813899 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=AbixrPMu; dkim-atps=neutral Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RBdt733Z0z1yYc for ; Fri, 28 Jul 2023 04:03:27 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 22D6C385B800 for ; Thu, 27 Jul 2023 18:03:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 22D6C385B800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690481005; bh=ilB+m54+PxQ7r/qRytizo37aWj40AYos0LjtcyxlVE4=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=AbixrPMueBpc08HwGHHLY7d4XApTdgqAzsE3Ypezu9pGz3Mi9e31IlAvdwVOCQHGK +IwdoNjxRSq/qxY6+7S1gWESa1UmzkpqswtIh6YkVIbuYPjn4vVV4tY3ok5QzGX97D J8uV9XUGeIBFKKU3FfZr1zzxaPE+rdtmIhORlwis= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mgamail.intel.com (unknown [134.134.136.24]) by sourceware.org (Postfix) with ESMTPS id 7FB9E3858C36 for ; Thu, 27 Jul 2023 18:02:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7FB9E3858C36 X-IronPort-AV: E=McAfee;i="6600,9927,10784"; a="371088294" X-IronPort-AV: E=Sophos;i="6.01,235,1684825200"; d="scan'208";a="371088294" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2023 11:00:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10784"; a="762301213" X-IronPort-AV: E=Sophos;i="6.01,235,1684825200"; d="scan'208";a="762301213" Received: from scymds03.sc.intel.com ([10.148.94.166]) by orsmga001.jf.intel.com with ESMTP; 27 Jul 2023 10:51:25 -0700 Received: from gskx-1.sc.intel.com (gskx-1.sc.intel.com [172.25.149.211]) by scymds03.sc.intel.com (Postfix) with ESMTP id 9284764; Thu, 27 Jul 2023 10:51:25 -0700 (PDT) To: libc-alpha@sourceware.org Cc: hjl.tools@gmail.com Subject: [PATCH v2] Add strlcat/wcslcat testcase. Date: Thu, 27 Jul 2023 10:51:25 -0700 Message-ID: <20230727175125.2793598-1-skpgkp2@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-8.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FORGED_GMAIL_RCVD, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_SHORT, MAY_BE_FORGED, NML_ADSP_CUSTOM_MED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Sunil K Pandey via Libc-alpha From: Sunil Pandey Reply-To: Sunil K Pandey Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" This patch implements comprehensive tests for strlcat/wcslcat functions. Tests are mostly derived from strncat test suites and modified to incorporate strlcat/wcslcat specifications. Changes from v1: Rename test-strlcat to tst-strlcat2. Rename test-wcslcat to tst-wcslcat2. Remove unused SIMPLE_STRLCAT function. Rearrange defines in alphabetical order. --- string/Makefile | 1 + string/tst-strlcat2.c | 374 ++++++++++++++++++++++++++++++++++++++++++ wcsmbs/Makefile | 1 + wcsmbs/tst-wcslcat2.c | 20 +++ 4 files changed, 396 insertions(+) create mode 100644 string/tst-strlcat2.c create mode 100644 wcsmbs/tst-wcslcat2.c diff --git a/string/Makefile b/string/Makefile index 8cdfd5b000..5d94b91ac9 100644 --- a/string/Makefile +++ b/string/Makefile @@ -198,6 +198,7 @@ tests := \ tst-strerror-fail \ tst-strfry \ tst-strlcat \ + tst-strlcat2 \ tst-strlcpy \ tst-strlen \ tst-strtok \ diff --git a/string/tst-strlcat2.c b/string/tst-strlcat2.c new file mode 100644 index 0000000000..5d6aebd34a --- /dev/null +++ b/string/tst-strlcat2.c @@ -0,0 +1,374 @@ +/* Test strlcat functions. + Copyright (C) 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 + . */ + +#define TEST_MAIN +#ifndef WIDE +# define TEST_NAME "strlcat" +#else +# define TEST_NAME "wcslcat" +#endif /* WIDE */ +#include "test-string.h" + +#ifndef WIDE +# define BIG_CHAR CHAR_MAX +# define CHAR char +# define MEMCMP memcmp +# define MEMCPY memcpy +# define MEMSET memset +# define SMALL_CHAR 127 +# define STRLCAT strlcat +# define STRLEN strlen +# define STRNLEN strnlen +# define UCHAR unsigned char +#else +# include +# define BIG_CHAR WCHAR_MAX +# define CHAR wchar_t +# define MEMCMP wmemcmp +# define MEMCPY wmemcpy +# define MEMSET wmemset +# define SMALL_CHAR 1273 +# define STRLCAT wcslcat +# define STRLEN wcslen +# define STRNLEN wcsnlen +# define UCHAR wchar_t +#endif /* WIDE */ + +typedef size_t (*proto_t) (CHAR *, const CHAR *, size_t); + +IMPL (STRLCAT, 1) + +static void +__attribute__((noinline)) +do_one_test (impl_t *impl, CHAR *dst, const CHAR *src, + size_t n) +{ + size_t exp_ret, func_ret; + size_t src_length = STRLEN (src); + size_t dst_length = STRNLEN (dst, n); + + if (n == 0) + exp_ret = src_length; + else + exp_ret = src_length + dst_length; + + func_ret = CALL (impl, dst, src, n); + if (exp_ret != func_ret) + { + error (0, 0, "Wrong result in function %s %zd != %zd", impl->name, + exp_ret, func_ret); + ret = 1; + return; + } + + if (dst_length != n) + { + size_t to_copy = n - dst_length - 1; + if (to_copy > src_length) + to_copy = src_length; + if (MEMCMP (dst + dst_length, src, to_copy) != 0) + { + error (0, 0, "Incorrect concatenation in function %s", + impl->name); + ret = 1; + return; + } + if (dst[dst_length + to_copy] != '\0') + { + error (0, 0, "There is no zero in the end of output string in %s", + impl->name); + ret = 1; + return; + } + } + return; +} + +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_EACH_IMPL (impl, 0) + { + + for (i = 0; i < len2; i++) + s2[i] = 32 + 23 * i % (max_char - 32); + 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) - 1024; + UCHAR *p2 = (UCHAR *) (buf2 + page_size) - 1024; + UCHAR *p3 = (UCHAR *) buf1; + size_t res; + fprintf (stdout, "Number of iterations in random test = %zd\n", + ITERATIONS); + for (n = 0; n < ITERATIONS; n++) + { + N = random () & 1023; + align1 = random () & 255; + align2 = random () & 255; + len1 = random () & 255; + len2 = random () & 255; + + for (i = 0; i < len1; i++) + { + p1[align1 + i] = random () & BIG_CHAR; + if (!p1[align1 + i]) + p1[align1 + i] = (random () & SMALL_CHAR) + 3; + } + p1[align1 + len1] = 0; + + for (i = 0; i < len2; i++) + { + p3[i] = random () & BIG_CHAR; + if (!p3[i]) + p3[i] = (random () & SMALL_CHAR) + 3; + } + p3[len2] = 0; + + size_t exp_ret; + size_t src_length = STRLEN ((CHAR *) (p1 + align1)); + size_t dst_length = STRNLEN ((CHAR *) (p3), N); + + if (N == 0) + exp_ret = src_length; + else + exp_ret = src_length + dst_length; + + FOR_EACH_IMPL (impl, 1) + { + MEMSET (p2 - 64, '\1', align2 + 64); + MEMSET (p2 + align2 + len2 + 1, '\1', 1024 - align2 - len2 - 1); + MEMCPY (p2 + align2, p3, len2 + 1); + res = CALL (impl, (CHAR *) (p2 + align2), + (CHAR *) (p1 + align1), N); + if (res != exp_ret) + { + error (0, 0, "Iteration %zd - wrong result in function %s " + "(%zd, %zd, %zd, %zd, %zd) %zd != %zd", + n, impl->name, align1, align2, len1, len2, N, + res, exp_ret); + 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 (N > len2 + 1) + { + j = (N - len2 - 1 >= len1) ? len1 : N - len2 - 1; + if (MEMCMP (p2 + align2 + len2, p1 + align1, j)) + { + error (0, 0, "Iteration %zd - different strings, %s " + "(%zd, %zd, %zd, %zd)", n, impl->name, align1, + align2, len2, j); + ret = 1; + } + + if (p2[align2 + len2 + j] != '\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; + } + + for (j = j + align2 + len2 + 1; j < 1024; ++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; + } + } + } + else + { + if (p2[align2 + len2] != '\0') + { + error (0, 0, "Iteration %zd - destination modified, %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 (); + return ret; +} + +#include diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 431136b9c9..cf9b1a3c70 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -179,6 +179,7 @@ tests := \ tst-wcpncpy \ tst-wcrtomb \ tst-wcslcat \ + tst-wcslcat2 \ tst-wcslcpy \ tst-wcsnlen \ tst-wcstod-nan-locale \ diff --git a/wcsmbs/tst-wcslcat2.c b/wcsmbs/tst-wcslcat2.c new file mode 100644 index 0000000000..3278e3af13 --- /dev/null +++ b/wcsmbs/tst-wcslcat2.c @@ -0,0 +1,20 @@ +/* Test wcslcat functions. + Copyright (C) 2023 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 + . */ + +#define WIDE 1 +#include "../string/tst-strlcat2.c"