score: Check time of day in _TOD_Set()

Close #3949.

2 files changed, 20 insertions, 4 deletions

diff --git a/cpukit/posix/src/clocksettime.c b/cpukit/posix/src/clocksettime.c
index 5bb6f2f14b..49e4761875 100644
--- a/cpukit/posix/src/clocksettime.c
+++ b/cpukit/posix/src/clocksettime.c
@@ -40,9 +40,6 @@ int clock_settime(
   if ( clock_id == CLOCK_REALTIME ) {
     ISR_lock_Context lock_context;
 
-    if ( tp->tv_sec < TOD_SECONDS_1970_THROUGH_1988 )
-      rtems_set_errno_and_return_minus_one( EINVAL );
-
     _TOD_Lock();
     _TOD_Acquire( &lock_context );
       status = _TOD_Set( tp, &lock_context );
diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c
index ed840ece2b..b9a745d9b4 100644
--- a/cpukit/score/src/coretodset.c
+++ b/cpukit/score/src/coretodset.c
@@ -22,6 +22,25 @@
 #include <rtems/score/assert.h>
 #include <rtems/score/watchdogimpl.h>
 
+static Status_Control _TOD_Check_time_of_day_and_run_hooks(
+  const struct timespec *tod
+)
+{
+  if ( !_Watchdog_Is_valid_timespec( tod ) ) {
+    return STATUS_INVALID_NUMBER;
+  }
+
+  if ( tod->tv_sec < TOD_SECONDS_1970_THROUGH_1988 ) {
+    return STATUS_INVALID_NUMBER;
+  }
+
+  if ( _Watchdog_Is_far_future_timespec( tod ) ) {
+    return STATUS_INVALID_NUMBER;
+  }
+
+  return _TOD_Hook_Run( TOD_ACTION_SET_CLOCK, tod );
+}
+
 Status_Control _TOD_Set(
   const struct timespec *tod,
   ISR_lock_Context      *lock_context
@@ -35,7 +54,7 @@ Status_Control _TOD_Set(
 
   _Assert( _TOD_Is_owner() );
 
-  status = _TOD_Hook_Run( TOD_ACTION_SET_CLOCK, tod );
+  status = _TOD_Check_time_of_day_and_run_hooks( tod );
   if ( status != STATUS_SUCCESSFUL ) {
     _TOD_Release( lock_context );
     return status;