Skip to content

Commit 39ff83f

Browse files
tttechindustrial-hannenKAGA-KOKO
authored andcommitted
time: Handle negative seconds correctly in timespec64_to_ns()
timespec64_ns() prevents multiplication overflows by comparing the seconds value of the timespec to KTIME_SEC_MAX. If the value is greater or equal it returns KTIME_MAX. But that check casts the signed seconds value to unsigned which makes the comparision true for all negative values and therefore return wrongly KTIME_MAX. Negative second values are perfectly valid and required in some places, e.g. ptp_clock_adjtime(). Remove the cast and add a check for the negative boundary which is required to prevent undefined behaviour due to multiplication underflow. Fixes: cb47755 ("time: Prevent undefined behaviour in timespec64_to_ns()")' Signed-off-by: Lukas Hannen <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/AM6PR01MB541637BD6F336B8FFB72AF80EEC69@AM6PR01MB5416.eurprd01.prod.exchangelabs.com
1 parent 8596e58 commit 39ff83f

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

include/linux/time64.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ struct itimerspec64 {
2525
#define TIME64_MIN (-TIME64_MAX - 1)
2626

2727
#define KTIME_MAX ((s64)~((u64)1 << 63))
28+
#define KTIME_MIN (-KTIME_MAX - 1)
2829
#define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC)
30+
#define KTIME_SEC_MIN (KTIME_MIN / NSEC_PER_SEC)
2931

3032
/*
3133
* Limits for settimeofday():
@@ -124,10 +126,13 @@ static inline bool timespec64_valid_settod(const struct timespec64 *ts)
124126
*/
125127
static inline s64 timespec64_to_ns(const struct timespec64 *ts)
126128
{
127-
/* Prevent multiplication overflow */
128-
if ((unsigned long long)ts->tv_sec >= KTIME_SEC_MAX)
129+
/* Prevent multiplication overflow / underflow */
130+
if (ts->tv_sec >= KTIME_SEC_MAX)
129131
return KTIME_MAX;
130132

133+
if (ts->tv_sec <= KTIME_SEC_MIN)
134+
return KTIME_MIN;
135+
131136
return ((s64) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;
132137
}
133138

0 commit comments

Comments
 (0)