mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 02:03:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

time: Fix overflow itimer tests on 32-bit systems

Browse Source 
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  <adhemerval.zanella@linaro.org>
This commit is contained in:
Stafford Horne 2021-06-07 22:10:19 +09:00
parent 0f62fe0532
commit 6e8a0aac2f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/time.h
View File

@ -11,6 +11,7 @@
# include <sys/time.h> # include <sys/time.h>
# include <time-clockid.h> # include <time-clockid.h>
# include <sys/time.h> # include <sys/time.h>
# include <stdint.h>
extern __typeof (strftime_l) __strftime_l; extern __typeof (strftime_l) __strftime_l;
libc_hidden_proto (__strftime_l) libc_hidden_proto (__strftime_l)
@ -342,11 +343,12 @@ libc_hidden_proto (__time64)
actual clock ID. */ actual clock ID. */
#define CLOCK_IDFIELD_SIZE 3 #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 static inline bool
in_time_t_range (__time64_t t) in_time_t_range (__time64_t t)
{ {
time_t s = t; int32_t s = t;
return s == t; return s == t;
} }
@ -453,8 +455,8 @@ timespec64_to_timeval64 (const struct __timespec64 ts64)
and suseconds_t. */ and suseconds_t. */
struct __timeval32 struct __timeval32
{ {
__int32_t tv_sec; /* Seconds. */ int32_t tv_sec; /* Seconds. */
__int32_t tv_usec; /* Microseconds. */ int32_t tv_usec; /* Microseconds. */
}; };
/* Conversion functions for converting to/from __timeval32 */ /* Conversion functions for converting to/from __timeval32 */

4
time/tst-itimer.c
View File

@ -100,7 +100,7 @@ do_test (void)
/* Linux does not provide 64 bit time_t support for getitimer and /* Linux does not provide 64 bit time_t support for getitimer and
setitimer on architectures with 32 bit time_t support. */ 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], &it, NULL), 0);
TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { 0 }, TEST_COMPARE (setitimer (timers[i], &(struct itimerval) { 0 },
@ -131,7 +131,7 @@ do_test (void)
it.it_interval.tv_usec = 20; it.it_interval.tv_usec = 20;
it.it_value.tv_sec = 30; it.it_value.tv_sec = 30;
it.it_value.tv_usec = 40; 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); TEST_COMPARE (setitimer (timers[i], &it, NULL), 0);