From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 31 Jan 2006 18:16:55 +0000 (-0800)
Subject: Don't try to "validate" a non-existing timeval.
X-Git-Tag: v2.6.16-rc2~254
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=951069e311a2a931bf7c9d838db860f90bf14c45;p=linux-2.6

Don't try to "validate" a non-existing timeval.

settime() with a NULL timeval is silly but legal.

Noticed by Dave Jones <davej@redhat.com>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/kernel/time.c b/kernel/time.c
index 7477b1d207..1f23e683d6 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -155,7 +155,7 @@ int do_sys_settimeofday(struct timespec *tv, struct timezone *tz)
 	static int firsttime = 1;
 	int error = 0;
 
-	if (!timespec_valid(tv))
+	if (tv && !timespec_valid(tv))
 		return -EINVAL;
 
 	error = security_settime(tv, tz);
diff --git a/security/seclvl.c b/security/seclvl.c
index 1caac01646..8529ea6f7a 100644
--- a/security/seclvl.c
+++ b/security/seclvl.c
@@ -368,8 +368,8 @@ static int seclvl_capable(struct task_struct *tsk, int cap)
  */
 static int seclvl_settime(struct timespec *tv, struct timezone *tz)
 {
-	struct timespec now;
-	if (seclvl > 1) {
+	if (tv && seclvl > 1) {
+		struct timespec now;
 		now = current_kernel_time();
 		if (tv->tv_sec < now.tv_sec ||
 		    (tv->tv_sec == now.tv_sec && tv->tv_nsec < now.tv_nsec)) {