From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by sourceware.org (Postfix) with ESMTPS id 05FE23858C83 for ; Mon, 7 Feb 2022 21:42:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 05FE23858C83 Received: by mail-io1-xd2e.google.com with SMTP id q204so18718130iod.8 for ; Mon, 07 Feb 2022 13:42:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NkkQU3JvhxvRRyLLxbUodvr42YaHFrgaRXmMM4ICg0c=; b=2/0twOTtpK2L4/G6R9AhIe6kibMaeX0v6077XRhnKRDI6E5DPdws84DZvNyb2/iPe1 hUphJmT4d44izJEUrMdC9TM9wJclYKaPuxg0a41jIaSaRySEWGKki3cNh+PEAsyvW/9z H3vxLTWe5KNrd7Kzmr9cD9Vhhsjx2XtvXr3mSZPAjUsAr6xnhakYonY6M1uCxzh/1Ual QUtn+B+oCfeDU1xIo+rrg3p4hWIR3+czpPWJETNi6hskIsn6/CcKWDHV80qGhII2uGfE A/bLJPKOBtP2CRuJDFbwnt5f9GZE/eHhJr/KD/D/f7Sz+I6TPHAm2P4BAkvKGkOxpgF3 /tGg== X-Gm-Message-State: AOAM530uTKyfir+nnhfXnFs6hxM9tuQE3mbtWF4tRqbu9s2abkK4Xf1p F3qiTd4SBLPCt1K+VgRYPOmIXvaWRbc= X-Google-Smtp-Source: ABdhPJzjPnqbfAgm+q/sZ4Xv4eS9MnwPZpjKwFtMWCoMN6p+Ey3nmemdd9yyRIgXgDqm8CS6Gex+fA== X-Received: by 2002:a6b:917:: with SMTP id t23mr697262ioi.214.1644270125134; Mon, 07 Feb 2022 13:42:05 -0800 (PST) Received: from localhost.localdomain ([2600:1008:b06b:6ec6:5380:9b0a:dd6c:b5da]) by smtp.googlemail.com with ESMTPSA id o7sm6188452ilt.63.2022.02.07.13.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 13:42:04 -0800 (PST) From: Noah Goldstein To: libc-alpha@sourceware.org Subject: [PATCH v2] String: Ensure 'MIN_PAGE_SIZE' is multiple of 'getpagesize' Date: Mon, 7 Feb 2022 15:41:36 -0600 Message-Id: <20220207214136.3443442-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220207201624.601598-1-goldstein.w.n@gmail.com> References: <20220207201624.601598-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Mon, 07 Feb 2022 21:42:07 -0000 When 'TEST_LEN' was defined as (4096 * 3) the allocation size Would not be a multiple of system page size if system page size > 4096. --- string/test-strcmp.c | 14 +++++++------- string/test-strncmp.c | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/string/test-strcmp.c b/string/test-strcmp.c index eacbdc8857..0abce769d0 100644 --- a/string/test-strcmp.c +++ b/string/test-strcmp.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#define TEST_LEN (4096 * 3) +#define TEST_LEN (getpagesize () * 3) #define MIN_PAGE_SIZE (TEST_LEN + 2 * getpagesize ()) #define TEST_MAIN @@ -393,7 +393,7 @@ int test_main (void) { size_t i, j; - + const size_t test_len = MIN(TEST_LEN, 3 * 4096); test_init (); check(); check2 (); @@ -435,7 +435,7 @@ test_main (void) for (j = 0; j < 160; ++j) { - for (i = 0; i < TEST_LEN;) + for (i = 0; i < test_len;) { do_test (getpagesize () - j - 1, 0, i, 127, 0); do_test (getpagesize () - j - 1, 0, i, 127, 1); @@ -461,17 +461,17 @@ test_main (void) { i += 7; } - else if (i + 161 < TEST_LEN) + else if (i + 161 < test_len) { i += 31; i *= 17; i /= 16; - if (i + 161 > TEST_LEN) + if (i + 161 > test_len) { - i = TEST_LEN - 160; + i = test_len - 160; } } - else if (i + 32 < TEST_LEN) + else if (i + 32 < test_len) { i += 7; } diff --git a/string/test-strncmp.c b/string/test-strncmp.c index 1a3cee1792..1966bde3fe 100644 --- a/string/test-strncmp.c +++ b/string/test-strncmp.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#define TEST_LEN (4096 * 3) +#define TEST_LEN (getpagesize () * 3) #define MIN_PAGE_SIZE (TEST_LEN + 2 * getpagesize ()) #define TEST_MAIN @@ -430,7 +430,7 @@ check_overflow (void) const size_t of_masks[] = { ULONG_MAX, LONG_MIN, ULONG_MAX - (ULONG_MAX >> 2), ((size_t)LONG_MAX) >> 1 }; - + const size_t test_len = MIN(test_len, 3 * 4096); for (of_idx = 0; of_idx < sizeof (of_masks) / sizeof (of_masks[0]); ++of_idx) { of_mask = of_masks[of_idx]; @@ -484,7 +484,7 @@ check_overflow (void) of_mask - j * 2, 0, 127, -1); } - for (i = 1; i < TEST_LEN; i += i) + for (i = 1; i < test_len; i += i) { do_test_n (j, 0, i - 1, of_mask, 0, 127, 0); do_test_n (j, 0, i - 1, of_mask, 0, 127, 1); @@ -540,7 +540,7 @@ int test_main (void) { size_t i, j; - + const size_t test_len = MIN(test_len, 3 * 4096); test_init (); check1 (); @@ -608,7 +608,7 @@ test_main (void) for (j = 0; j < 160; ++j) { - for (i = 0; i < TEST_LEN;) + for (i = 0; i < test_len;) { do_test_n (getpagesize () - j - 1, 0, i, i + 1, 0, 127, 0); do_test_n (getpagesize () - j - 1, 0, i, i + 1, 0, 127, 1); @@ -677,17 +677,17 @@ test_main (void) { i += 7; } - else if (i + 161 < TEST_LEN) + else if (i + 161 < test_len) { i += 31; i *= 17; i /= 16; - if (i + 161 > TEST_LEN) + if (i + 161 > test_len) { - i = TEST_LEN - 160; + i = test_len - 160; } } - else if (i + 32 < TEST_LEN) + else if (i + 32 < test_len) { i += 7; } -- 2.25.1