From patchwork Tue Apr 4 19:00:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Simmons-Talbott X-Patchwork-Id: 1765184 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=8.43.85.97; helo=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=lA5CvQql; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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 4PrcYQ2HBpz1yZc for ; Wed, 5 Apr 2023 05:01:14 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2BFC43857B9B for ; Tue, 4 Apr 2023 19:01:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2BFC43857B9B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680634872; bh=6tT7t1ejThGiZB4JugWP5wgOXIovXlLTUbbZQT5uq+4=; 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=lA5CvQqlcs33C9MiQitX8AufMV2ihJnz7wM+/2AATQGdfWxFFarOyElM9V7vTi6VU IDPgioAqsy15Q4+dBIlaSwyIHnm0DnrEQ0kKWMTP4UbEmj2pF3ndmNynqPldu+G2Ch +R8o5NNMoUPXQTT7xZYuGrv3zVATCkMLYqP4WxOw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id D0B2C3858C2C for ; Tue, 4 Apr 2023 19:00:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D0B2C3858C2C Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-341-NwWvzVk6N1alwQ4xYeElug-1; Tue, 04 Apr 2023 15:00:53 -0400 X-MC-Unique: NwWvzVk6N1alwQ4xYeElug-1 Received: by mail-qk1-f198.google.com with SMTP id t23-20020a374617000000b0074a4dba4b5aso2566629qka.16 for ; Tue, 04 Apr 2023 12:00:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680634852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6tT7t1ejThGiZB4JugWP5wgOXIovXlLTUbbZQT5uq+4=; b=KXqp3sM05lm0GPZ5NSy9BHvIrGVr0IQfArQnAdFdTRSrmpjkYuQl5X3rTHRP5YEa0j Q/K+iFju+TxOyhdM5TRG/OMv7MCjekTzFz9HrTGgq8tOAGmMkr+0yKCHe4gzVEnbIOJn IT3MSOdvIDfBnBH2LRLuPjl4Xgn7bnw6lmS3tNA+i0YHAi1sJsLUN7jGGhk+tlOcTsy7 ixpVQunURY13NDBj9ZxeJhcF3FocleKFei5W9DuimYaLy1FJdxzty/Ys0eSrfr5pcsWH GMgyfRDVeyxB549ReC3VavWSE74jrP/6/98B3mn7QpQUfflCrRO5Rq0rSGWui3EzXAoG rIWw== X-Gm-Message-State: AAQBX9efL58MllWwVuW5hLKgrRJA1DjhDs438+f7uYhcTQNSWPwkBW8s v3njA4s7CnjWyQKOpqxeVMAU68Sl4nnMFrtBhDD62ysi02N5TWcoz1RJYXitQvtZ2tdiNtEI34U iGOuJycvwGHDmyqn6mWNf2YzsOhxbSIeYRP1EgFqfcaNm7oqaN/HsV7lRaoOiyJqHhrXg1S7Mp8 9XKHuf X-Received: by 2002:a05:622a:85:b0:3e3:828e:a562 with SMTP id o5-20020a05622a008500b003e3828ea562mr629193qtw.39.1680634851752; Tue, 04 Apr 2023 12:00:51 -0700 (PDT) X-Google-Smtp-Source: AKy350YVfjrtGnJ6pUTYnfSJQDbOR7KPrRawPmPHseJQrlOaet7Huf9rUE4Jl0A4cpZoYV/vIB3z0A== X-Received: by 2002:a05:622a:85:b0:3e3:828e:a562 with SMTP id o5-20020a05622a008500b003e3828ea562mr629152qtw.39.1680634851455; Tue, 04 Apr 2023 12:00:51 -0700 (PDT) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id b8-20020ac844c8000000b003e4d9c91106sm3434502qto.57.2023.04.04.12.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 12:00:51 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v3 1/3] string: Allow use of test-string.h for non-ifunc implementations. Date: Tue, 4 Apr 2023 15:00:38 -0400 Message-Id: <20230404190040.2507343-2-josimmon@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404190040.2507343-1-josimmon@redhat.com> References: <20230329150500.2886135-1-josimmon@redhat.com> <20230404190040.2507343-1-josimmon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP 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: Joe Simmons-Talbott via Libc-alpha From: Joe Simmons-Talbott Reply-To: Joe Simmons-Talbott Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Mark two variables as unused to silence warning when using test-string.h for non-ifunc implemenations. Reviewed-by: Adhemerval Zanella --- string/test-string.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/string/test-string.h b/string/test-string.h index 41de973479..8bcb8afd0a 100644 --- a/string/test-string.h +++ b/string/test-string.h @@ -130,8 +130,8 @@ cmdline_process_function (int c) /* Increase size of FUNC_LIST if assert is triggered at run-time. */ static struct libc_ifunc_impl func_list[32]; static int func_count; -static int impl_count = -1; -static impl_t *impl_array; +static int impl_count __attribute__ ((unused)) = -1; +static impl_t *impl_array __attribute__ ((unused)); # define FOR_EACH_IMPL(impl, notall) \ impl_t *impl; \ From patchwork Tue Apr 4 19:00:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Simmons-Talbott X-Patchwork-Id: 1765190 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=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=Z7H1BweH; dkim-atps=neutral Received: from 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 4PrcZB4S8Nz1yZQ for ; Wed, 5 Apr 2023 05:01:54 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8C8D73857C5A for ; Tue, 4 Apr 2023 19:01:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8C8D73857C5A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680634912; bh=ikM0uROBSu/p6hDH5lOSx+OrGppKngQOpiOcUvHsK+E=; 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=Z7H1BweH68E/P1NX3PaSa+tQm6hNR6vIRBkUwebP1l6seJ++OfggiH9IpJOb+CgZs 2LnqBKQgsQ873/Z3Vbv2DFQ1koR4ccPcXg/HmRxNRWt2ak2bNS/4UujOYIERT57L50 LRFD6DmncWSKigCsOPLW0aIDTZVmqX8ETMHTTnFQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 302AE3858C2B for ; Tue, 4 Apr 2023 19:00:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 302AE3858C2B Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-383-2fldAKtuNIed4Y7QYJ-UJw-1; Tue, 04 Apr 2023 15:00:56 -0400 X-MC-Unique: 2fldAKtuNIed4Y7QYJ-UJw-1 Received: by mail-qk1-f197.google.com with SMTP id 203-20020a370ad4000000b00746981f8f4bso15274759qkk.13 for ; Tue, 04 Apr 2023 12:00:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680634854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ikM0uROBSu/p6hDH5lOSx+OrGppKngQOpiOcUvHsK+E=; b=LjDLhCX/qEdSxUSvB1WgHxTEhT51oVSpbLnTAxes9KKnrAtmHosCcmnsRP+Ns+zgOF bIfcFvf3glXFVzOwMNFfMmcsKx+FX0q39mXrZeKoiPdhxbRDyOW6TKBzh+cdSExKNzPV 8+kts7ftAfEvHllx4u5TXxcs17kHKVczN6l007JtYPDlpMjt1ufbaQVLgB8TxYHgOFH1 sE9wQ2JAfr/u4tTGQs+1ZRZh79PNChkgUd0q6zRv1bjiMOc8/tjH/mk5hd0KjDrHvF3J 2HdRL8kOt4EMosI6QrzeZD+RV183e6YSUa4IxJbZx2vndFFdbv9EopS1YRVWR/5/H0ko w2ew== X-Gm-Message-State: AAQBX9eU4kpVRzq/5vZqlBHhTJa57+PE2evCO4H99SHzrnjlrpMWJQPJ AuTJxU+/iQBfNnRkI+ubGcjlqcHIqzhnlBHMQd5TVPv2jIRTQijlBjeczvjrlehoh9boYWInl3H YR8HfypN3UzHrKYqYE7ldXF/P6CGKJW/QXGGAx/QqOBg0cJn/H4ILTmPsmYTGqJ66XK1ORPTMMI bQdZBv X-Received: by 2002:a05:622a:1051:b0:3bf:c3be:758e with SMTP id f17-20020a05622a105100b003bfc3be758emr930755qte.16.1680634854360; Tue, 04 Apr 2023 12:00:54 -0700 (PDT) X-Google-Smtp-Source: AKy350ac/Fqp/f/7pMi6UjvTPpzid1W8V4NedStvJTnqkOBi3P934x49fXeXUy726fKZR2RqR9deyA== X-Received: by 2002:a05:622a:1051:b0:3bf:c3be:758e with SMTP id f17-20020a05622a105100b003bfc3be758emr930691qte.16.1680634853811; Tue, 04 Apr 2023 12:00:53 -0700 (PDT) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id b8-20020ac844c8000000b003e4d9c91106sm3434502qto.57.2023.04.04.12.00.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 12:00:53 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v3 2/3] string: Add tests for strdup (BZ #30266) Date: Tue, 4 Apr 2023 15:00:39 -0400 Message-Id: <20230404190040.2507343-3-josimmon@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404190040.2507343-1-josimmon@redhat.com> References: <20230329150500.2886135-1-josimmon@redhat.com> <20230404190040.2507343-1-josimmon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP 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: Joe Simmons-Talbott via Libc-alpha From: Joe Simmons-Talbott Reply-To: Joe Simmons-Talbott Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Copy strcpy tests for strdup. Covers some basic testcases with random strings. Add a zero-length string testcase. Reviewed-by: Adhemerval Zanella --- string/Makefile | 1 + string/test-strdup.c | 201 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 202 insertions(+) create mode 100644 string/test-strdup.c diff --git a/string/Makefile b/string/Makefile index c84b49aaa5..472e318aea 100644 --- a/string/Makefile +++ b/string/Makefile @@ -157,6 +157,7 @@ tests := \ test-strcmp \ test-strcpy \ test-strcspn \ + test-strdup \ test-strlen \ test-strncasecmp \ test-strncat \ diff --git a/string/test-strdup.c b/string/test-strdup.c new file mode 100644 index 0000000000..f45fb4c852 --- /dev/null +++ b/string/test-strdup.c @@ -0,0 +1,201 @@ +/* Test and measure strdup 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 + . */ + +#include + +#ifdef WIDE +# include +# define CHAR wchar_t +# define UCHAR wchar_t +# define sfmt "ls" +# define BIG_CHAR WCHAR_MAX +# define SMALL_CHAR 1273 +# define STRCMP wcscmp +# define MEMCMP wmemcmp +# define MEMSET wmemset +#else +# define CHAR char +# define UCHAR unsigned char +# define sfmt "s" +# define BIG_CHAR CHAR_MAX +# define SMALL_CHAR 127 +# define STRCMP strcmp +# define MEMCMP memcmp +# define MEMSET memset +#endif + +#ifndef STRDUP_RESULT +# define STRDUP_RESULT(dst, len) dst +# define TEST_MAIN +# ifndef WIDE +# define TEST_NAME "strdup" +# else +# define TEST_NAME "wcsdup" +# endif +# include "test-string.h" +# ifndef WIDE +# define STRDUP strdup +# else +# define STRDUP wcsdup +# endif +#endif + +typedef CHAR *(*proto_t) (const CHAR *); + +static void +do_zero_len_test (void) +{ + char src[1] = { '\0' }; + char *dst = STRDUP (src); + + TEST_COMPARE_STRING (dst, src); + free(dst); +} + +static void +do_one_test (const CHAR *src, + size_t len __attribute__((unused))) +{ + char *dst = STRDUP (src); + + if (STRCMP (dst, src) != 0) + { + error (0, 0, + "Wrong result in function %s dst \"%" sfmt "\" src \"%" sfmt "\"", + TEST_NAME, dst, src); + ret = 1; + free(dst); + return; + } + free(dst); +} + +static void +do_test (size_t align1, size_t align2, size_t len, int max_char) +{ + size_t i; + CHAR *s1; +/* For wcsdup: align1 and align2 here mean alignment not in bytes, + but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t)) + len for wcschr here isn't in bytes but it's number of wchar_t symbols. */ + align1 &= 7; + if ((align1 + len) * sizeof (CHAR) >= page_size) + return; + + align2 &= 7; + if ((align2 + len) * sizeof (CHAR) >= page_size) + return; + + s1 = (CHAR *) (buf1) + align1; + + for (i = 0; i < len; i++) + s1[i] = 32 + 23 * i % (max_char - 32); + s1[len] = 0; + + do_one_test (s1, len); +} + +static void +do_random_tests (void) +{ + size_t i, j, n, align1, align2, len; + UCHAR *p1 = (UCHAR *) (buf1 + page_size) - 512; + UCHAR *res; + + for (n = 0; n < ITERATIONS; n++) + { + /* align1 and align2 are expressed as wchar_t and not in bytes for wide + char test, and thus it will be equal to align times wchar_t size. + + For non wide version we need to check all alignments from 0 to 63 + since some assembly implementations have separate prolog for alignments + more 48. */ + + align1 = random () & (63 / sizeof (CHAR)); + if (random () & 1) + align2 = random () & (63 / sizeof (CHAR)); + else + align2 = align1 + (random () & 24); + len = random () & 511; + j = align1; + if (align2 > j) + j = align2; + if (len + j >= 511) + len = 510 - j - (random () & 7); + j = len + align1 + 64; + if (j > 512) + j = 512; + for (i = 0; i < j; i++) + { + if (i == len + align1) + p1[i] = 0; + else + { + p1[i] = random () & BIG_CHAR; + if (i >= align1 && i < len + align1 && !p1[i]) + p1[i] = (random () & SMALL_CHAR) + 3; + } + } + + res = (UCHAR *) STRDUP((CHAR *) p1 + align1); + TEST_COMPARE_STRING((CHAR *) res, (CHAR *) (p1 + align1)); + free(res); + } +} + + +int +test_main (void) +{ + size_t i; + + test_init (); + + printf ("%23s", ""); + printf ("\t%s", TEST_NAME); + putchar ('\n'); + + for (i = 0; i < 16; ++i) + { + do_test (0, 0, i, SMALL_CHAR); + do_test (0, 0, i, BIG_CHAR); + do_test (0, i, i, SMALL_CHAR); + do_test (i, 0, i, BIG_CHAR); + } + + for (i = 1; i < 8; ++i) + { + do_test (0, 0, 8 << i, SMALL_CHAR); + do_test (8 - i, 2 * i, 8 << i, SMALL_CHAR); + } + + for (i = 1; i < 8; ++i) + { + do_test (i, 2 * i, 8 << i, SMALL_CHAR); + do_test (2 * i, i, 8 << i, BIG_CHAR); + do_test (i, i, 8 << i, SMALL_CHAR); + do_test (i, i, 8 << i, BIG_CHAR); + } + + do_zero_len_test (); + do_random_tests (); + + return ret; +} + +#include From patchwork Tue Apr 4 19:00:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Simmons-Talbott X-Patchwork-Id: 1765191 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=8.43.85.97; helo=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=HqEwm40n; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (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 4PrcZK4Bf5z1yZQ for ; Wed, 5 Apr 2023 05:02:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8FEF3385417F for ; Tue, 4 Apr 2023 19:01:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8FEF3385417F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680634919; bh=gARBOGaYYDqhp3OgHWEQImd+pTH+ixHc1ZEsssYrmms=; 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=HqEwm40nPhXQignqSCvc0ltpkp+eQqSYiHu0ockUDZQoVPqRWq8TESWD/I1Ao01Zs r1pxQyGSAlKhFAcRiG9Dog94Xd4BJ2zzvPuYxdgjqbl1Gub2uXKMh0jujRujCaD7Tx onkvvJHtI/y6EyRjNvuiHk7DLumvDOqCoid9U70M= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 3B53A3858412 for ; Tue, 4 Apr 2023 19:00:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B53A3858412 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-223-vvAkyNb7NTO92aGqun28PQ-1; Tue, 04 Apr 2023 15:00:57 -0400 X-MC-Unique: vvAkyNb7NTO92aGqun28PQ-1 Received: by mail-qk1-f199.google.com with SMTP id 206-20020a370cd7000000b007467b5765d2so15283636qkm.0 for ; Tue, 04 Apr 2023 12:00:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680634856; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gARBOGaYYDqhp3OgHWEQImd+pTH+ixHc1ZEsssYrmms=; b=nn1sJA0CRkJERx/t/sxaeKK5QzCJO0kr4JfC3tkYdxnZxblD2uTkSWj1bl/GYVDeuA PaLud39kEy9iB8zJj77bohidLtsuJPelGd75an4bxyFdbfQjW1VDEMH5wLncoNIFPiai XI2T4L5P0IgA6utbr1AGwxcW7b5SbaiVItmkMT2d/lZVVwGgmnvQTOUkUk70Ms7X7aJk dJ8k7mtxB+BVF1gFSSjXX1xyb4OVMwER+Exl3sq9rVcqhTZ7fxFkrWZPefypl7kS1nIL e7Eiu3tmnCuGI9k/pPx1In+6DlzFRywBqRvaaQ3eUMiFVzS+G7O0VePglMLnGLFfM6kS hC8Q== X-Gm-Message-State: AAQBX9dxEvfv56uWTgosv7IDAe8tDsqo7NR/pxQ4ukkOZsiy69DT7ZTC apBQ/+I4NNsmwFHi+lQPWCq1Cgjec+jr/l/hVEbA5zrppGJnf4Azn0ppQGf7rTllmN8VxaMghTq Qlij1TyS4iHORtvDsbhHj/HPJsCGS16gCSDwlnQdWLfvUlV1s/J47BaUl94bhMNQVlZZzdjHklN rf+hTY X-Received: by 2002:ad4:5aa3:0:b0:56e:b3dc:fe8c with SMTP id u3-20020ad45aa3000000b0056eb3dcfe8cmr6012351qvg.28.1680634856353; Tue, 04 Apr 2023 12:00:56 -0700 (PDT) X-Google-Smtp-Source: AKy350api30VxFMkovrwoxMHZhkcutAnSzlSV/KpDPnYJMAqtDGuHSDNA86MCPkDOYjA7lqbInByww== X-Received: by 2002:ad4:5aa3:0:b0:56e:b3dc:fe8c with SMTP id u3-20020ad45aa3000000b0056eb3dcfe8cmr6012283qvg.28.1680634855822; Tue, 04 Apr 2023 12:00:55 -0700 (PDT) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id b8-20020ac844c8000000b003e4d9c91106sm3434502qto.57.2023.04.04.12.00.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 12:00:55 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v3 3/3] string: Add tests for strndup (BZ #30266) Date: Tue, 4 Apr 2023 15:00:40 -0400 Message-Id: <20230404190040.2507343-4-josimmon@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404190040.2507343-1-josimmon@redhat.com> References: <20230329150500.2886135-1-josimmon@redhat.com> <20230404190040.2507343-1-josimmon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP 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: Joe Simmons-Talbott via Libc-alpha From: Joe Simmons-Talbott Reply-To: Joe Simmons-Talbott Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Copy strncpy tests for strndup. Covers some basic testcases with random strings. Remove tests that set the destination's bytes and checked the resulting buffer's bytes. --- string/Makefile | 1 + string/test-strndup.c | 250 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 251 insertions(+) create mode 100644 string/test-strndup.c diff --git a/string/Makefile b/string/Makefile index 472e318aea..2eef6f1dfc 100644 --- a/string/Makefile +++ b/string/Makefile @@ -163,6 +163,7 @@ tests := \ test-strncat \ test-strncmp \ test-strncpy \ + test-strndup \ test-strnlen \ test-strpbrk \ test-strrchr \ diff --git a/string/test-strndup.c b/string/test-strndup.c new file mode 100644 index 0000000000..a65373fa96 --- /dev/null +++ b/string/test-strndup.c @@ -0,0 +1,250 @@ +/* Test strndup 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 + . */ + +#include + +#ifdef WIDE +# include +# define CHAR wchar_t +# define UCHAR wchar_t +# define BIG_CHAR WCHAR_MAX +# define SMALL_CHAR 1273 +# define MEMCMP wmemcmp +# define MEMSET wmemset +# define STRNLEN wcsnlen +#else +# define CHAR char +# define UCHAR unsigned char +# define BIG_CHAR CHAR_MAX +# define SMALL_CHAR 127 +# define MEMCMP memcmp +# define MEMSET memset +# define STRNLEN strnlen +#endif /* !WIDE */ + + +#ifndef STRNDUP_RESULT +# define STRNDUP_RESULT(dst, len, n) dst +# define TEST_MAIN +# ifndef WIDE +# define TEST_NAME "strndup" +# else +# define TEST_NAME "wcsndup" +# endif /* WIDE */ +# include "test-string.h" +# ifndef WIDE +# define STRNDUP strndup +# else +# define STRNDUP wcsndup +# endif /* WIDE */ + +#endif /* !STRNDUP_RESULT */ + +typedef CHAR *(*proto_t) (const CHAR *, size_t); + +static void +do_one_test (const CHAR *src, size_t len, size_t n) +{ + char *dst = STRNDUP(src, n); + size_t s = (len > n ? n: len) * sizeof (CHAR); + + TEST_COMPARE_BLOB(dst, s, src, s); +} + +static void +do_test (size_t align1, size_t align2, size_t len, size_t n, int max_char) +{ + size_t i; + CHAR *s1; + +/* For wcsndup: align1 and align2 here mean alignment not in bytes, + but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t)). */ + align1 &= 7; + if ((align1 + len) * sizeof (CHAR) >= page_size) + return; + + align2 &= 7; + if ((align2 + len) * sizeof (CHAR) >= page_size) + return; + + s1 = (CHAR *) (buf1) + align1; + + for (i = 0; i < len; ++i) + s1[i] = 32 + 23 * i % (max_char - 32); + s1[len] = 0; + for (i = len + 1; (i + align1) * sizeof (CHAR) < page_size && i < len + 64; + ++i) + s1[i] = 32 + 32 * i % (max_char - 32); + + do_one_test (s1, len, n); +} + +static void +do_page_tests (void) +{ + CHAR *s1; + const size_t maxoffset = 64; + + /* Put s1 at the maxoffset from the edge of buf1's last page. */ + s1 = (CHAR *) buf1 + BUF1PAGES * page_size / sizeof(CHAR) - maxoffset; + /* s2 needs room to put a string with size of maxoffset + 1 at s2 + + (maxoffset - 1). */ + + MEMSET (s1, 'a', maxoffset - 1); + s1[maxoffset - 1] = '\0'; + + /* Both strings are bounded to a page with read/write access and the next + page is protected with PROT_NONE (meaning that any access outside of the + page regions will trigger an invalid memory access). + + The loop copies the string s1 for all possible offsets up to maxoffset + for both inputs with a size larger than s1 (so memory access outside the + expected memory regions might trigger invalid access). */ + + for (size_t off1 = 0; off1 < maxoffset; off1++) + { + for (size_t off2 = 0; off2 < maxoffset; off2++) + { + do_one_test (s1 + off1, maxoffset - off1 - 1, + maxoffset + (maxoffset - off2)); + } + } +} + +static void +do_random_tests (void) +{ + size_t i, j, n, align1, align2, len, size, mode; + UCHAR *p1 = (UCHAR *) (buf1 + page_size) - 512; + UCHAR *res; + + for (n = 0; n < ITERATIONS; n++) + { + /* For wcsndup: align1 and align2 here mean align not in bytes, + but in wchar_ts, in bytes it will equal to align * (sizeof + (wchar_t)). */ + + mode = random (); + if (mode & 1) + { + size = random () & 255; + align1 = 512 - size - (random () & 15); + if (mode & 2) + align2 = align1 - (random () & 24); + else + align2 = align1 - (random () & 31); + if (mode & 4) + { + j = align1; + align1 = align2; + align2 = j; + } + if (mode & 8) + len = size - (random () & 31); + else + len = 512; + if (len >= 512) + len = random () & 511; + } + else + { + align1 = random () & 31; + if (mode & 2) + align2 = random () & 31; + else + align2 = align1 + (random () & 24); + len = random () & 511; + j = align1; + if (align2 > j) + j = align2; + if (mode & 4) + { + size = random () & 511; + if (size + j > 512) + size = 512 - j - (random () & 31); + } + else + size = 512 - j; + if ((mode & 8) && len + j >= 512) + len = 512 - j - (random () & 7); + } + j = len + align1 + 64; + if (j > 512) + j = 512; + for (i = 0; i < j; i++) + { + if (i == len + align1) + p1[i] = 0; + else + { + p1[i] = random () & BIG_CHAR; + if (i >= align1 && i < len + align1 && !p1[i]) + p1[i] = (random () & SMALL_CHAR) + 3; + } + } + + res = (UCHAR *) STRNDUP ((CHAR *) (p1 + align1), size); + j = len + 1; + if (size < j) + j = size; + if (MEMCMP (p1 + align1, res, j)) + { + error (0, 0, "Iteration %zd - different strings, %s (%zd, %zd, %zd)", + n, "strndup", align1, align2, len); + ret = 1; + } + } +} + +int +test_main (void) +{ + size_t i; + + test_init (); + + printf ("%28s", ""); + printf ("\t%s", TEST_NAME); + putchar ('\n'); + + for (i = 1; i < 8; ++i) + { + do_test (i, i, 16, 16, SMALL_CHAR); + do_test (i, i, 16, 16, BIG_CHAR); + do_test (i, 2 * i, 16, 16, SMALL_CHAR); + do_test (2 * i, i, 16, 16, BIG_CHAR); + do_test (8 - i, 2 * i, 1 << i, 2 << i, SMALL_CHAR); + do_test (2 * i, 8 - i, 2 << i, 1 << i, SMALL_CHAR); + do_test (8 - i, 2 * i, 1 << i, 2 << i, BIG_CHAR); + do_test (2 * i, 8 - i, 2 << i, 1 << i, BIG_CHAR); + } + + for (i = 1; i < 8; ++i) + { + do_test (0, 0, 4 << i, 8 << i, SMALL_CHAR); + do_test (0, 0, 16 << i, 8 << i, SMALL_CHAR); + do_test (8 - i, 2 * i, 4 << i, 8 << i, SMALL_CHAR); + do_test (8 - i, 2 * i, 16 << i, 8 << i, SMALL_CHAR); + } + + do_random_tests (); + do_page_tests (); + return ret; +} + +#include