X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Ffutex_compat.c;h=1ab6a0ea3d14776e9a84d3b8af71ffd418da5498;hb=b5ed7639c9f502898af4109e778f5613dacbfd9c;hp=54274fc853216d7448762c78e37ac0cd30d5e8f6;hpb=9561b03dc360068504cb296d325fb84295f91fbb;p=linux-2.6

diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index 54274fc853..1ab6a0ea3d 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -129,9 +129,11 @@ asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val,
 	unsigned long timeout = MAX_SCHEDULE_TIMEOUT;
 	int val2 = 0;
 
-	if ((op == FUTEX_WAIT) && utime) {
+	if (utime && (op == FUTEX_WAIT)) {
 		if (get_compat_timespec(&t, utime))
 			return -EFAULT;
+		if (!timespec_valid(&t))
+			return -EINVAL;
 		timeout = timespec_to_jiffies(&t) + 1;
 	}
 	if (op >= FUTEX_REQUEUE)