From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 1A48C3858425 for ; Mon, 10 Apr 2023 15:59:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1A48C3858425 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681142387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0cSEvvK962p/u7tD0+Yh+NFQOo+CJxm0ScDWNggWcwU=; b=SV0GSfl6jDpbWNnxGq1TfeluOngkvz+/qLSufHZqrqds00hyjUixnc/gLYLipbQeHu4CyM lUTEQ0cEmLybAdxww+1s2DTFOwYmCM81elVEmb1cjpJf0LE8VfPaeJKEtx4/B21w5PJJg4 l6gqi4Ztz10uXwN+/9k11n00gGHwSVI= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-449-CUpLEPoeNuGK8tg06ByNYg-1; Mon, 10 Apr 2023 11:59:46 -0400 X-MC-Unique: CUpLEPoeNuGK8tg06ByNYg-1 Received: by mail-qv1-f69.google.com with SMTP id f17-20020a0cbed1000000b005d70160fbb0so2783129qvj.21 for ; Mon, 10 Apr 2023 08:59:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681142386; x=1683734386; 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=0cSEvvK962p/u7tD0+Yh+NFQOo+CJxm0ScDWNggWcwU=; b=CDAGiqELsP93Z51kYfLZ5pMgcHMorJ6ekAAKDoLoCifL7CnNCFwprAQwnEnmH9Foo3 xe14ALyUIajy4rFgclFFo++x4ohmhl6WjolKgcVNMfFENOr8vbRhU57ZLnxcnJnIgUDl 6OfBZhEtRfLLD8hElp5ms7H+olCc27dPhaWQyCUej5VKeWHjQ1IIbmF/yvH/TIoZ1YQG JxoLcfYdNT3kOf1YyPyXuyZjGMHJUa0Qwz4uhzeb6dh1OZ2VLypC2HFYmHIuIjv+xANl +upVpbECOixFD8pJoS2HgFVB1vxwOKK8UlbwqdBXXDFb7BZDf4cpIwyDNbHGRLq9/iyg fYbA== X-Gm-Message-State: AAQBX9crNVYZpmmukseEJNwye/Xdm5C6FHGF5ER972cTQWVhFOe9xNfa /ZPLomOWuOollgExZg2cCI20Oia6ya/2v8xdG89eMqv85aw1qbbbCelYVj8ryR1uXTHMWUA7TrY gPKtnfGZD2rF8NGIq+YpC1YC8cft9l1oNl2r/mrtWI90pga5HtEJHRDhHcEZo3F8D64FZIwQNrV jqt0n1 X-Received: by 2002:ad4:4eaf:0:b0:5df:88d0:cf9d with SMTP id ed15-20020ad44eaf000000b005df88d0cf9dmr18869118qvb.39.1681142385776; Mon, 10 Apr 2023 08:59:45 -0700 (PDT) X-Google-Smtp-Source: AKy350aZtfs8jOaRtfQjq0k3wqatFgFPR/c8JyS1vCmt3uhNGNhXv5MU3Qicdj43bRFkJbp6fOBbmg== X-Received: by 2002:ad4:4eaf:0:b0:5df:88d0:cf9d with SMTP id ed15-20020ad44eaf000000b005df88d0cf9dmr18869085qvb.39.1681142385347; Mon, 10 Apr 2023 08:59:45 -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 h2-20020ad45442000000b005dd8b9345e0sm3470413qvt.120.2023.04.10.08.59.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 08:59:44 -0700 (PDT) From: Joe Simmons-Talbott To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v4 3/4] string: Add tests for strndup (BZ #30266) Date: Mon, 10 Apr 2023 11:59:33 -0400 Message-Id: <20230410155934.3503627-4-josimmon@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230410155934.3503627-1-josimmon@redhat.com> References: <20230329150500.2886135-1-josimmon@redhat.com> <20230410155934.3503627-1-josimmon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.1 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 List-Id: 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 | 222 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 223 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..b5665a3eec --- /dev/null +++ b/string/test-strndup.c @@ -0,0 +1,222 @@ +/* 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 CHAR char +#define UCHAR unsigned char +#define BIG_CHAR CHAR_MAX +#define SMALL_CHAR 127 +#define MEMSET memset + + +#ifndef STRNDUP_RESULT +# define STRNDUP_RESULT(dst, len, n) dst +# define TEST_MAIN +# define TEST_NAME "strndup" +# include "test-string.h" + +#endif /* !STRNDUP_RESULT */ + +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; + 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", 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 -- 2.39.2