diff mbox

[1/7] time: make sure tz_minuteswest is set to a valid value when setting time

Message ID 1432142376-2077-2-git-send-email-john.stultz@linaro.org
State Accepted
Commit 6f7d79849a00bba82d3139ff91ff2aaabd12841e
Headers show

Commit Message

John Stultz May 20, 2015, 5:19 p.m. UTC 
From: Sasha Levin <sasha.levin@oracle.com>

Invalid values may overflow later, leading to undefined behaviour when
multiplied by 60 to get the amount of seconds.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 kernel/time/time.c | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox

Patch

diff --git a/kernel/time/time.c b/kernel/time/time.c
index c42c2c3..972e3bb 100644
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -173,6 +173,10 @@  int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
 		return error;
 
 	if (tz) {
+		/* Verify we're witin the +-15 hrs range */
+		if (tz->tz_minuteswest > 15*60 || tz->tz_minuteswest < -15*60)
+			return -EINVAL;
+
 		sys_tz = *tz;
 		update_vsyscall_tz();
 		if (firsttime) {