diff options
| -rw-r--r-- | sys/kern/kern_event.c | 7 | ||||
| -rw-r--r-- | sys/kern/sys_generic.c | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index c3d1b86..362f5ee 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1329,12 +1329,13 @@ kqueue_scan(struct kqueue *kq, int maxevents, struct kevent_copyops *k_ops, goto done_nl; } if (timespecisset(tsp)) { - if (tsp->tv_sec < INT32_MAX) { + if (tsp->tv_sec <= INT32_MAX) { rsbt = tstosbt(*tsp); if (TIMESEL(&asbt, rsbt)) asbt += tc_tick_sbt; - asbt += rsbt; - if (asbt < rsbt) + if (asbt <= INT64_MAX - rsbt) + asbt += rsbt; + else asbt = 0; rsbt >>= tc_precexp; } else diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 2d149b5..45b9327 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1051,16 +1051,17 @@ kern_select(struct thread *td, int nd, fd_set *fd_in, fd_set *fd_ou, error = EINVAL; goto done; } - if (rtv.tv_sec == 0 && rtv.tv_usec == 0) + if (!timevalisset(&rtv)) asbt = 0; - else if (rtv.tv_sec < INT32_MAX) { + else if (rtv.tv_sec <= INT32_MAX) { rsbt = tvtosbt(rtv); precision = rsbt; precision >>= tc_precexp; if (TIMESEL(&asbt, rsbt)) asbt += tc_tick_sbt; - asbt += rsbt; - if (asbt < rsbt) + if (asbt <= INT64_MAX - rsbt) + asbt += rsbt; + else asbt = -1; } else asbt = -1; |
