projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] x86_64: Check for bad dma address in b44 1GB DMA workaround
[powerpc.git]
/
kernel
/
futex.c
diff --git
a/kernel/futex.c
b/kernel/futex.c
index
9c9b2b6
..
5699c51
100644
(file)
--- a/
kernel/futex.c
+++ b/
kernel/futex.c
@@
-1039,9
+1039,11
@@
asmlinkage long sys_futex(u32 __user *uaddr, int op, int val,
unsigned long timeout = MAX_SCHEDULE_TIMEOUT;
int val2 = 0;
unsigned long timeout = MAX_SCHEDULE_TIMEOUT;
int val2 = 0;
- if (
(op == FUTEX_WAIT) && utime
) {
+ if (
utime && (op == FUTEX_WAIT)
) {
if (copy_from_user(&t, utime, sizeof(t)) != 0)
return -EFAULT;
if (copy_from_user(&t, utime, sizeof(t)) != 0)
return -EFAULT;
+ if (!timespec_valid(&t))
+ return -EINVAL;
timeout = timespec_to_jiffies(&t) + 1;
}
/*
timeout = timespec_to_jiffies(&t) + 1;
}
/*