From patchwork Fri Aug 6 09:42:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 44596 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com 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 218F339A005A for ; Fri, 6 Aug 2021 09:42:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 218F339A005A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1628242975; bh=+KAP1GiPxcBkREJMhPNsQlvTNXJSeUTlLDE6WcaDFRE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=elwLvBOfapVZakyTLvGM+Vckv3cJyf4k1zM+0NW0XUFUO3R4Y33WYVNnipOVomqEU vrODgLGeMkzWh1Ukh9HOqNYO9BOcw9ImNlaIzbuOZfCcRW7ByFP0UpY9aO0VQU9uRl hnN4wmJRzhDyNQKT0NrQzZfN3XtdQPfEcku9H1QU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by sourceware.org (Postfix) with ESMTPS id 8D87F3857420 for ; Fri, 6 Aug 2021 09:42:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8D87F3857420 Received: by mail-pj1-x1029.google.com with SMTP id u5-20020a17090ae005b029017842fe8f82so7514319pjy.0 for ; Fri, 06 Aug 2021 02:42:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+KAP1GiPxcBkREJMhPNsQlvTNXJSeUTlLDE6WcaDFRE=; b=Iwjx9SlZ9flDvJP6kN0JCnq+XLddYmLGP6dDRXBZh+Olynd56lxc81n8wcECMBXX1o dBcHDRBwDzwL+yzCz1WqTC9JwaoyKS6Qql7wOX67sTf5CJ1ECMwHRbXF1Q4kSHdY/7tm ooHbmQEfW3nLcOvgMQkrVVjx6urNvpovVQeUQFdBIfm4wprdVUfWtoNvhUvhf+asTArc YAwZtoP/K7pxCXM2qY/VXTpK3paMVkDtL9MhYSOH0SxxSil8RMXbSzYlPi0q1iZrwUu9 8Oo6MHQR2yhAB4F+IftYVLKsGMIMQZZPtRYm0uU8WoUwU+PDP/dqUpCwUpinlxlIjI3n z7uQ== X-Gm-Message-State: AOAM532Y8smJWydZvaPxdajQheaDVU+ucL7dJBE3tpVytch5JjzbUw6D bvW49QsRxkvkhLaV74MxiLfeimiSeiE= X-Google-Smtp-Source: ABdhPJyP6MovwFB1lqrAk335NA7KkrgwUU2AFzzt8JlPUBhheVSjn1rK72ASQTILxy42ApOLWWyq2A== X-Received: by 2002:a63:48c:: with SMTP id 134mr901416pge.122.1628242951314; Fri, 06 Aug 2021 02:42:31 -0700 (PDT) Received: from localhost (g195.61-45-49.ppp.wakwak.ne.jp. [61.45.49.195]) by smtp.gmail.com with ESMTPSA id g23sm10255689pfk.148.2021.08.06.02.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Aug 2021 02:42:30 -0700 (PDT) To: GLIBC patches Subject: [PATCH v2] time: Fix overflow itimer tests on 32-bit systems Date: Fri, 6 Aug 2021 18:42:17 +0900 Message-Id: <20210806094217.3227877-1-shorne@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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-Patchwork-Original-From: Stafford Horne via Libc-alpha From: Stafford Horne Reply-To: Stafford Horne Cc: Openrisc Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" On the port of OpenRISC I am working on and it appears the rv32 port we have sets __TIMESIZE == 64 && __WORDSIZE == 32. This causes the size of time_t to be 8 bytes, but the tv_sec in the kernel is still 32-bit causing truncation. The truncations are unavoidable on these systems so skip the testing/failures by guarding with __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64. Also, futher in the tests and in other parts of code checking for time_t overflow does not work on 32-bit systems when time_t is 64-bit. As suggested by Adhemerval, update the in_time_t_range function to assume 32-bits by using int32_t. This also brings in the header for stdint.h so we can update other usages of __int32_t to int32_t as suggested by Adhemerval. Reviewed-by: Adhemerval Zanella --- Hello, Sorry for the delay to get this out I have been busy on the hardware side of openrisc the last month so I haven't been able to spend time on getting this out. The patch ends up doing a test fix and some lib code fixes, I can split it to separate small patches. But since as a whole it's small I feel leaving it together is best. -Stafford include/time.h | 10 ++++++---- time/tst-itimer.c | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/time.h b/include/time.h index 4372bfbd96..ba3c5116cf 100644 --- a/include/time.h +++ b/include/time.h @@ -11,6 +11,7 @@ # include # include # include +# include extern __typeof (strftime_l) __strftime_l; libc_hidden_proto (__strftime_l) @@ -334,11 +335,12 @@ libc_hidden_proto (__time64) actual clock ID. */ #define CLOCK_IDFIELD_SIZE 3 -/* Check whether T fits in time_t. */ +/* Check whether T fits in int32_t, assume all usages are for + sizeof(time_t) == 32. */ static inline bool in_time_t_range (__time64_t t) { - time_t s = t; + int32_t s = t; return s == t; } @@ -445,8 +447,8 @@ timespec64_to_timeval64 (const struct __timespec64 ts64) and suseconds_t. */ struct __timeval32 { - __int32_t tv_sec; /* Seconds. */ - __int32_t tv_usec; /* Microseconds. */ + int32_t tv_sec; /* Seconds. */ + int32_t tv_usec; /* Microseconds. */ }; /* Conversion functions for converting to/from __timeval32 */ diff --git a/time/tst-itimer.c b/time/tst-itimer.c index 929c2b74c7..bd7d7afe83 100644 --- a/time/tst-itimer.c +++ b/time/tst-itimer.c @@ -100,7 +100,7 @@ do_test (void) /* Linux does not provide 64 bit time_t support for getitimer and setitimer on architectures with 32 bit time_t support. */ - if (sizeof (__time_t) == 8) + if (__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64) { TEST_COMPARE (setitimer (timers[i], &it, NULL), 0); TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { 0 }, @@ -131,7 +131,7 @@ do_test (void) it.it_interval.tv_usec = 20; it.it_value.tv_sec = 30; it.it_value.tv_usec = 40; - if (sizeof (__time_t) == 8) + if (__KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64) { TEST_COMPARE (setitimer (timers[i], &it, NULL), 0);