diff options
Diffstat (limited to 'fs/select.c')
| -rw-r--r-- | fs/select.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/select.c b/fs/select.c index 6ce68a9c8976..1815a57d2255 100644 --- a/fs/select.c +++ b/fs/select.c | |||
| @@ -404,7 +404,7 @@ asmlinkage long sys_select(int n, fd_set __user *inp, fd_set __user *outp, | |||
| 404 | goto sticky; | 404 | goto sticky; |
| 405 | rtv.tv_usec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)); | 405 | rtv.tv_usec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)); |
| 406 | rtv.tv_sec = timeout; | 406 | rtv.tv_sec = timeout; |
| 407 | if (timeval_compare(&rtv, &tv) < 0) | 407 | if (timeval_compare(&rtv, &tv) >= 0) |
| 408 | rtv = tv; | 408 | rtv = tv; |
| 409 | if (copy_to_user(tvp, &rtv, sizeof(rtv))) { | 409 | if (copy_to_user(tvp, &rtv, sizeof(rtv))) { |
| 410 | sticky: | 410 | sticky: |
| @@ -471,7 +471,7 @@ asmlinkage long sys_pselect7(int n, fd_set __user *inp, fd_set __user *outp, | |||
| 471 | rts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) * | 471 | rts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) * |
| 472 | 1000; | 472 | 1000; |
| 473 | rts.tv_sec = timeout; | 473 | rts.tv_sec = timeout; |
| 474 | if (timespec_compare(&rts, &ts) < 0) | 474 | if (timespec_compare(&rts, &ts) >= 0) |
| 475 | rts = ts; | 475 | rts = ts; |
| 476 | if (copy_to_user(tsp, &rts, sizeof(rts))) { | 476 | if (copy_to_user(tsp, &rts, sizeof(rts))) { |
| 477 | sticky: | 477 | sticky: |
| @@ -775,7 +775,7 @@ asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds, | |||
| 775 | rts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) * | 775 | rts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) * |
| 776 | 1000; | 776 | 1000; |
| 777 | rts.tv_sec = timeout; | 777 | rts.tv_sec = timeout; |
| 778 | if (timespec_compare(&rts, &ts) < 0) | 778 | if (timespec_compare(&rts, &ts) >= 0) |
| 779 | rts = ts; | 779 | rts = ts; |
| 780 | if (copy_to_user(tsp, &rts, sizeof(rts))) { | 780 | if (copy_to_user(tsp, &rts, sizeof(rts))) { |
| 781 | sticky: | 781 | sticky: |
