From ea7471d515aaedd46c84df0d06b712c48651410f Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 31 Jan 2006 10:20:49 -0800
Subject: [PATCH] --- yaml --- r: 19041 b: refs/heads/master c:
 f7dd16bf3a2e7e29670051a2488d4be1895e408d h: refs/heads/master i:   19039:
 f139fd53579f98d02416a82664f779825eba61a9 v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/time.c     | 2 +-
 trunk/security/seclvl.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d57c11f580b6..ece1cc76f27d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22f01da398069e823e79f1209518f0913e05fc47
+refs/heads/master: f7dd16bf3a2e7e29670051a2488d4be1895e408d
diff --git a/trunk/kernel/time.c b/trunk/kernel/time.c
index 7477b1d2079e..1f23e683d6aa 100644
--- a/trunk/kernel/time.c
+++ b/trunk/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/trunk/security/seclvl.c b/trunk/security/seclvl.c
index 1caac0164643..8529ea6f7aa8 100644
--- a/trunk/security/seclvl.c
+++ b/trunk/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)) {