From patchwork Tue May 16 21:35:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 69493 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 7A3A2385770E for ; Tue, 16 May 2023 21:37:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7A3A2385770E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684273077; bh=aS5uggGr+mq2g1mz3//7PYbTq45sctvvq0SY8GZACXA=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=c+n5M4Kp3G7xm4Hy9SHnqgZgFhjVnLyHPgzzqcKu+03HSdmW62JNxiEoiLI2r4YJg FXE8p/TqP7TB2yEMD2S859E40DNKpUsSuCYc7KON0kcSh1nKvMRYRfDL/bqD/Sgml0 QZY8D5eEuhaN+WGNPCYq3L7wdEx1X8jqEN/Yf6EA= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id E8FC73858C41 for ; Tue, 16 May 2023 21:37:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E8FC73858C41 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-618-DOtma-avNwaB-DDbPHnFpA-1; Tue, 16 May 2023 17:35:39 -0400 X-MC-Unique: DOtma-avNwaB-DDbPHnFpA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5F472870828 for ; Tue, 16 May 2023 21:35:39 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 549E7BC88; Tue, 16 May 2023 21:35:38 +0000 (UTC) To: libc-alpha@sourceware.org Cc: Siddhesh Poyarekar , Joe Simmons-Talbott Subject: [PATCH] stdlib: Avoid undefined behavior in stdlib/tst-labs Date: Tue, 16 May 2023 23:35:36 +0200 Message-ID: <87cz303qon.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.5 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, 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The last loop could attempt to overflow beyond INT_MAX on 32-bit architectures. Also switch to GNU style. Reviewed-by: Siddhesh Poyarekar --- stdlib/tst-labs.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) base-commit: 641c4c2b7eb80e2cb2121b1c31096158091a6419 diff --git a/stdlib/tst-labs.c b/stdlib/tst-labs.c index 92b456745a..a8d2381f87 100644 --- a/stdlib/tst-labs.c +++ b/stdlib/tst-labs.c @@ -25,25 +25,26 @@ static int do_test (void) { - long i; + long int i; - TEST_COMPARE(labs(LONG_MAX), LONG_MAX); - TEST_COMPARE(labs(LONG_MIN + 1), LONG_MAX); - TEST_COMPARE(labs(-1), 1); - TEST_COMPARE(labs(0), 0); - TEST_COMPARE(labs(1), 1); + TEST_COMPARE (labs (LONG_MAX), LONG_MAX); + TEST_COMPARE (labs (LONG_MIN + 1), LONG_MAX); + TEST_COMPARE (labs (-1), 1); + TEST_COMPARE (labs (0), 0); + TEST_COMPARE (labs (1), 1); for (i = LONG_MIN + 1; i < LONG_MIN + INT_MAX; i += LARGE_PRIME) - TEST_COMPARE(labs(i), -i); + TEST_COMPARE (labs (i), -i); - for (i = LONG_MAX - INT_MAX; i < LONG_MAX - LARGE_PRIME; i += LARGE_PRIME) - TEST_COMPARE(labs(i), i); + for (i = LONG_MAX - INT_MAX; i < LONG_MAX - LARGE_PRIME; + i += LARGE_PRIME) + TEST_COMPARE (labs (i), i); for (i = INT_MIN + 1; i < 0; i += LARGE_PRIME) - TEST_COMPARE(labs(i), -i); + TEST_COMPARE (labs (i), -i); - for (i = 0; i < INT_MAX; i += LARGE_PRIME) - TEST_COMPARE(labs(i), i); + for (i = 0; i <= INT_MAX - LARGE_PRIME; i += LARGE_PRIME) + TEST_COMPARE (labs (i), i); return EXIT_SUCCESS; }