Skip to content

Commit

Permalink
[PATCH] hrtimer: create and use timespec_valid macro
Browse files Browse the repository at this point in the history
add timespec_valid(ts) [returns false if the timespec is denorm]

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Thomas Gleixner authored and Linus Torvalds committed Jan 10, 2006
1 parent 2a69897 commit 5f82b2b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
6 changes: 6 additions & 0 deletions include/linux/time.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions kernel/posix-timers.c
Original file line number Diff line number Diff line change
Expand Up @@ -712,8 +712,7 @@ sys_timer_create(const clockid_t which_clock,
*/
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;
}
Expand Down Expand Up @@ -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;

/*
Expand Down

0 comments on commit 5f82b2b

Please sign in to comment.