diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-12 11:10:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-12 11:10:31 -0700 |
| commit | 7bf3142625c193db2dfbd7df2176b7cd910d9e4f (patch) | |
| tree | d9a59af29d902fa0a10505250c50197d3dab8421 | |
| parent | fdfc346302a7b63e3d5b9168be74bb12b1975999 (diff) | |
| parent | 39ff83f2f6cc5cc1458dfcea9697f96338210beb (diff) | |
| download | linux-7bf3142625c193db2dfbd7df2176b7cd910d9e4f.tar.gz linux-7bf3142625c193db2dfbd7df2176b7cd910d9e4f.tar.xz | |
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()
| -rw-r--r-- | include/linux/time64.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/time64.h b/include/linux/time64.h index 5117cb5b5656..81b9686a2079 100644 --- a/include/linux/time64.h +++ b/include/linux/time64.h @@ -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(): @@ -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; } |