---

yaml --- r: 19036 b: refs/heads/master c: 951069e h: refs/heads/master v: v3
git-mirror · Jan 31, 2006 · c1e41e0 · c1e41e0
1 parent bcc2b10
commit c1e41e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ee68c4af3fd7228c1be63254b9f884614f9ebb2
+refs/heads/master: 951069e311a2a931bf7c9d838db860f90bf14c45
diff --git 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
@@ -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)) {