From: Sasha Levin <sasha.levin@oracle.com>
Date: Thu, 4 Dec 2014 00:25:05 +0000 (-0500)
Subject: time: adjtimex: Validate the ADJ_FREQUENCY values
X-Git-Tag: v3.16.35~2697
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e74cd063d763d9535c7f3e2974318a7cbd64eed4;p=thirdparty%2Fkernel%2Fstable.git

time: adjtimex: Validate the ADJ_FREQUENCY values

commit 5e5aeb4367b450a28f447f6d5ab57d8f2ab16a5f upstream.

Verify that the frequency value from userspace is valid and makes sense.

Unverified values can cause overflows later on.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
[jstultz: Fix up bug for negative values and drop redunent cap check]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 33db43a395154..3fca3fdd7c82c 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -632,6 +632,13 @@ int ntp_validate_timex(struct timex *txc)
 	if ((txc->modes & ADJ_SETOFFSET) && (!capable(CAP_SYS_TIME)))
 		return -EPERM;
 
+	if (txc->modes & ADJ_FREQUENCY) {
+		if (LONG_MIN / PPM_SCALE > txc->freq)
+			return -EINVAL;
+		if (LONG_MAX / PPM_SCALE < txc->freq)
+			return -EINVAL;
+	}
+
 	return 0;
 }