From patchwork Fri Apr 21 13:24:24 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: 68128 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 66FDA3851C3C for ; Fri, 21 Apr 2023 13:25:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 66FDA3851C3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682083538; bh=67U9cPOu9K9A2XBfU41AL8ngEnYtNnNMscxIROIEna4=; 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=oJIxbvnkjbrZZnn/u2frlVp89Cjw/zjvTKVAS6E6L17JGNmZgdxlamFrsNhrkt/kF ffmG8hk7ajfqfM5tQ3KaleLBl+n78BiMrXDbtjExya5x5bMn1uugCyCwHna9aJEent jR/83J6x2QPKoXhDgNXy+vqwH8C4adPO4DllTXiQ= 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 00535385840C for ; Fri, 21 Apr 2023 13:24:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 00535385840C Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-439-Y93094kXMQmKwQFrFLgjLA-1; Fri, 21 Apr 2023 09:24:33 -0400 X-MC-Unique: Y93094kXMQmKwQFrFLgjLA-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-3ed80d7bf28so11881261cf.3 for ; Fri, 21 Apr 2023 06:24:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682083472; x=1684675472; 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=67U9cPOu9K9A2XBfU41AL8ngEnYtNnNMscxIROIEna4=; b=cGwMLHnSSOzjk+oCCRVV0FOrPP+WFmzO8LZRKSbj2brSfD1hjgx0pzFNve2W7VJxZ+ un4n6GaPMfXojW3XkqErRfXnp2A7rekW3bI44NcFQvi7FKiELXxDL5fgnqPML54Czzp6 VqgG3ZwGWsIZysZ596OdN2lURRHrFIcpuTs0570Ac+lCODmIveNz2R15Fp8QSVsyjqsT b9DUjiZSywSFHyjqBodyMeO+aialdSWNSsu8KDH35KyVppmp72l7le+Fz51A85yS8dkn EnAqa8pVPpiwzukR+j+0Ek6Wyhy8K4RiFgtm5uHAmY4soLAKomZuN4UH9HU2hiL816Kq fvrg== X-Gm-Message-State: AAQBX9cJ9GkQuNLZ4LZN5bNTcuzJTPV3hJ8eljUwo+gZA/eWCYA/F45R 5CPWDv68ki2tbq23ttzfiWmmG23OYNInoCNciqMEEfWyTJYCFMdZQXTolc09m+ibv/6gbF4eGpf yo+dG4bjrav7RNQSXePdOjTQuAYhYaU+begKBT/EZhAC4l5nuwPBOT/G3ThukVXbaU/l8PU3i/n FQ8e51 X-Received: by 2002:a05:622a:490:b0:3ec:4292:bb8 with SMTP id p16-20020a05622a049000b003ec42920bb8mr7928199qtx.48.1682083472494; Fri, 21 Apr 2023 06:24:32 -0700 (PDT) X-Google-Smtp-Source: AKy350Zc3vJtjUNsAytpUrLzO1LTC9VuSGzJKmV1wIoOH8EpMs/STZ1NQ+v17oWXEJEcwvQgW8LH1A== X-Received: by 2002:a05:622a:490:b0:3ec:4292:bb8 with SMTP id p16-20020a05622a049000b003ec42920bb8mr7928169qtx.48.1682083472155; Fri, 21 Apr 2023 06:24:32 -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 w23-20020ac843d7000000b003d7e923736asm1328458qtn.6.2023.04.21.06.24.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 06:24:31 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v7 3/4] string: Add tests for strndup (BZ #30266) Date: Fri, 21 Apr 2023 09:24:24 -0400 Message-Id: <20230421132425.2178020-4-josimmon@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230421132425.2178020-1-josimmon@redhat.com> References: <20230329150500.2886135-1-josimmon@redhat.com> <20230421132425.2178020-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, 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: Joe Simmons-Talbott via Libc-alpha From: Joe Simmons-Talbott Reply-To: Joe Simmons-Talbott Errors-To: libc-alpha-bounces+patchwork=sourceware.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. Remove wide character test support since wcsndup() doesn't exist. --- string/Makefile | 1 + string/test-strndup.c | 198 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 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..4f5ccbe314 --- /dev/null +++ b/string/test-strndup.c @@ -0,0 +1,198 @@ +/* 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 + +#define TEST_MAIN +#include "test-string.h" + +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; + + 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; + + 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; + char *p1 = (char *) (buf1 + page_size) - 512; + char *res; + + for (n = 0; n < ITERATIONS; n++) + { + 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 () & CHAR_MAX; + if (i >= align1 && i < len + align1 && !p1[i]) + p1[i] = (random () & 127) + 3; + } + } + + res = (char *) strndup ((char *) (p1 + align1), size); + j = len + 1; + if (size < j) + j = size; + TEST_COMPARE_BLOB (res, j, (char *) (p1 + align1), j); + free (res); + } +} + +int +test_main (void) +{ + size_t i; + + test_init (); + + printf ("%28s", ""); + printf ("\t%s", "strndup"); + putchar ('\n'); + + for (i = 1; i < 8; ++i) + { + do_test (i, i, 16, 16, 127); + do_test (i, i, 16, 16, CHAR_MAX); + do_test (i, 2 * i, 16, 16, 127); + do_test (2 * i, i, 16, 16, CHAR_MAX); + do_test (8 - i, 2 * i, 1 << i, 2 << i, 127); + do_test (2 * i, 8 - i, 2 << i, 1 << i, 127); + do_test (8 - i, 2 * i, 1 << i, 2 << i, CHAR_MAX); + do_test (2 * i, 8 - i, 2 << i, 1 << i, CHAR_MAX); + } + + for (i = 1; i < 8; ++i) + { + do_test (0, 0, 4 << i, 8 << i, 127); + do_test (0, 0, 16 << i, 8 << i, 127); + do_test (8 - i, 2 * i, 4 << i, 8 << i, 127); + do_test (8 - i, 2 * i, 16 << i, 8 << i, 127); + } + + do_random_tests (); + do_page_tests (); + return ret; +} + +#include