From: Stafford Horne via Libc-alpha <libc-alpha@sourceware.org>
To: GLIBC patches <libc-alpha@sourceware.org>
Cc: Openrisc <openrisc@lists.librecores.org>
Subject: [PATCH v2] time: Fix overflow itimer tests on 32-bit systems
Date: Fri, 6 Aug 2021 18:42:17 +0900 [thread overview]
Message-ID: <20210806094217.3227877-1-shorne@gmail.com> (raw)
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.
---
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 <sys/time.h>
# include <time-clockid.h>
# include <sys/time.h>
+# include <stdint.h>
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);
--
2.31.1
next reply other threads:[~2021-08-06 9:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-06 9:42 Stafford Horne via Libc-alpha [this message]
2021-08-11 20:30 ` [PATCH v2] time: Fix overflow itimer tests on 32-bit systems Adhemerval Zanella via Libc-alpha
2021-08-14 22:24 ` Stafford Horne via Libc-alpha
2021-08-16 17:12 ` Joseph Myers
2021-08-16 21:54 ` Stafford Horne via Libc-alpha
2021-08-16 22:32 ` Joseph Myers
2021-08-17 23:33 ` Stafford Horne via Libc-alpha
2021-08-19 12:46 ` Adhemerval Zanella via Libc-alpha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210806094217.3227877-1-shorne@gmail.com \
--to=libc-alpha@sourceware.org \
--cc=openrisc@lists.librecores.org \
--cc=shorne@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).