diff options
| -rw-r--r-- | include/linux/time.h | 6 | ||||
| -rw-r--r-- | kernel/posix-timers.c | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 4d49cabb9b4..64e79746458 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -44,6 +44,12 @@ extern unsigned long mktime(const unsigned int year, const unsigned int mon, extern void set_normalized_timespec(struct timespec *ts, time_t sec, long nsec); +/* + * Returns true if the timespec is norm, false if denorm: + */ +#define timespec_valid(ts) \ + (((ts)->tv_sec >= 0) && (((unsigned) (ts)->tv_nsec) < NSEC_PER_SEC)) + extern struct timespec xtime; extern struct timespec wall_to_monotonic; extern seqlock_t xtime_lock; diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 69d5a4b5395..6b851a1bf4b 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -712,8 +712,7 @@ out: */ static int good_timespec(const struct timespec *ts) { - if ((!ts) || (ts->tv_sec < 0) || - ((unsigned) ts->tv_nsec >= NSEC_PER_SEC)) + if ((!ts) || !timespec_valid(ts)) return 0; return 1; } @@ -1406,7 +1405,7 @@ sys_clock_nanosleep(const clockid_t which_clock, int flags, if (copy_from_user(&t, rqtp, sizeof (struct timespec))) return -EFAULT; - if ((unsigned) t.tv_nsec >= NSEC_PER_SEC || t.tv_sec < 0) + if (!timespec_valid(&t)) return -EINVAL; /* |