Skip to content

Commit 7bf3142

Browse files
committed
Merge tag 'timers_urgent_for_v5.15_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Borislav Petkov: - Handle negative second values properly when converting a timespec64 to nanoseconds. * tag 'timers_urgent_for_v5.15_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: time: Handle negative seconds correctly in timespec64_to_ns()
2 parents fdfc346 + 39ff83f commit 7bf3142

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)