Patch "[PATCH 110/135] ntp: Fix ADJ_SETOFFSET being used w/ ADJ_NANO" has been added to the 4.4-stable tree

This is a note to let you know that I've just added the patch titled

[PATCH 110/135] ntp: Fix ADJ_SETOFFSET being used w/ ADJ_NANO

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     0110-ntp-Fix-ADJ_SETOFFSET-being-used-w-ADJ_NANO.patch

and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: John Stultz <[email protected]>
Date: Thu, 14 Apr 2016 10:25:14 -0600
Subject: [PATCH 110/135] ntp: Fix ADJ_SETOFFSET being used w/ ADJ_NANO

[ Upstream commit dd4e17ab704269bce71402285f5e8b9ac24b1eff ]

Recently, in commit 37cf4dc3370f I forgot to check if the timeval being passed was actually a timespec (as is signaled with ADJ_NANO).

This resulted in that patch breaking ADJ_SETOFFSET users who set ADJ_NANO, by rejecting valid timespecs that were compared with valid timeval ranges.

This patch addresses this by checking for the ADJ_NANO flag and using the timepsec check instead in that case.

---
 kernel/time/ntp.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

@@ -679,8 +679,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;
+		}
 	}
 
 	/*

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/0110-ntp-Fix-ADJ_SETOFFSET-being-used-w-ADJ_NANO.patch queue-4.4/0109-time-Verify-time-values-in-adjtimex-ADJ_SETOFFSET-to.patch queue-4.4/0118-clocksource-Allow-unregistering-the-watchdog.patch