Skip to content

Commit

Permalink
Merge tag 'timers_urgent_for_v5.15_rc1' of git://git.kernel.org/pub/s…
Browse files Browse the repository at this point in the history
…cm/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()
  • Loading branch information
torvalds committed Sep 12, 2021
2 parents fdfc346 + 39ff83f commit 7bf3142
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions include/linux/time64.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ struct itimerspec64 {
#define TIME64_MIN (-TIME64_MAX - 1)

#define KTIME_MAX ((s64)~((u64)1 << 63))
#define KTIME_MIN (-KTIME_MAX - 1)
#define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC)
#define KTIME_SEC_MIN (KTIME_MIN / NSEC_PER_SEC)

/*
* Limits for settimeofday():
Expand Down Expand Up @@ -124,10 +126,13 @@ static inline bool timespec64_valid_settod(const struct timespec64 *ts)
*/
static inline s64 timespec64_to_ns(const struct timespec64 *ts)
{
/* Prevent multiplication overflow */
if ((unsigned long long)ts->tv_sec >= KTIME_SEC_MAX)
/* Prevent multiplication overflow / underflow */
if (ts->tv_sec >= KTIME_SEC_MAX)
return KTIME_MAX;

if (ts->tv_sec <= KTIME_SEC_MIN)
return KTIME_MIN;

return ((s64) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;
}

Expand Down

0 comments on commit 7bf3142

Please sign in to comment.