1 files changed, 12 insertions, 2 deletions

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 36f2ca09aa5e..6df8927c58a5 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -685,8 +685,18 @@ int ntp_validate_timex(struct timex *txc)
                 if (!capable(CAP_SYS_TIME))
                         return -EPERM;
 
-                if (!timeval_inject_offset_valid(&txc->time))
-                        return -EINVAL;
+                if (txc->modes & ADJ_NANO) {
+                        struct timespec ts;
+
+                        ts.tv_sec = txc->time.tv_sec;
+                        ts.tv_nsec = txc->time.tv_usec;
+                        if (!timespec_inject_offset_valid(&ts))
+                                return -EINVAL;
+
+                } else {
+                        if (!timeval_inject_offset_valid(&txc->time))
+                                return -EINVAL;
+                }
         }
 
         /*