select: deal with math overflow from borderline valid userland data

[linux-2.6-omap-h63xx.git] / fs / compat.c

diff --git a/fs/compat.c b/fs/compat.c
index fe3c9bf876089f1d71f7b45b92fb5110693eb599..e5f49f5385028b865aca64890a588eaa173db042 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1684,8 +1684,9 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp,
                        return -EFAULT;
 
                to = &end_time;
-               if (poll_select_set_timeout(to, tv.tv_sec,
-                                           tv.tv_usec * NSEC_PER_USEC))
+               if (poll_select_set_timeout(to,
+                               tv.tv_sec + (tv.tv_usec / USEC_PER_SEC),
+                               (tv.tv_usec % USEC_PER_SEC) * NSEC_PER_USEC))
                        return -EINVAL;
        }