X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Ffutex_compat.c;h=1ab6a0ea3d14776e9a84d3b8af71ffd418da5498;hb=d87fa38e70853a9607dc34a02d15cf5f149f49f2;hp=9c077cf9aa84b81c0da8d87450b6fb491b3a231f;hpb=fdccffc6b711d1bfcd1e1b569537686dcad423e2;p=linux-2.6

diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
index 9c077cf9aa..1ab6a0ea3d 100644
--- a/kernel/futex_compat.c
+++ b/kernel/futex_compat.c
@@ -129,13 +129,16 @@ 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)
 		val2 = (int) (unsigned long) utime;
 
-	return do_futex(uaddr, op, val, timeout, uaddr2, val2, val3);
+	return do_futex((unsigned long)uaddr, op, val, timeout,
+			(unsigned long)uaddr2, val2, val3);
 }