---

yaml --- r: 74710 b: refs/heads/master c: 167b1de h: refs/heads/master v: v3
git-mirror · Dec 7, 2007 · efd5582 · efd5582
1 parent a9d4fa8
commit efd5582
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62f0f61e6673e67151a7c8c0f9a09c7ea43fe2b5
+refs/heads/master: 167b1de3ee4e50d65a2bd0a2667c9cd48faf54f3
diff --git a/trunk/kernel/time/clockevents.c b/trunk/kernel/time/clockevents.c
@@ -78,6 +78,11 @@ int clockevents_program_event(struct clock_event_device *dev, ktime_t expires,
 	unsigned long long clc;
 	int64_t delta;
 
+	if (unlikely(expires.tv64 < 0)) {
+		WARN_ON_ONCE(1);
+		return -ETIME;
+	}
+
 	delta = ktime_to_ns(ktime_sub(expires, now));
 
 	if (delta <= 0)