Skip to content

Fix timeout integer overflow #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Fix timeout integer overflow #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions support/unix/waitio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,22 @@ apr_status_t apr_wait_for_io_or_timeout(apr_file_t *f, apr_socket_t *s,
int for_read)
{
struct pollfd pfd;
apr_interval_time_t raw_timeout;
int rc, timeout;

timeout = f ? f->timeout : s->timeout;
raw_timeout = f ? f->timeout : s->timeout;
if (raw_timeout > ((apr_interval_time_t)INT_MAX) * 1000) {
/* timeout value exceeds maximum allowed (~25 days in microseconds)
* capping to INT_MAX milliseconds to avoid overflow */
timeout = INT_MAX;
} else {
/* convert microseconds to milliseconds (round up) */
timeout = raw_timeout > 0 ? (int)((raw_timeout + 999) / 1000) : (int)raw_timeout;
}

pfd.fd = f ? f->filedes : s->socketdes;
pfd.events = for_read ? POLLIN : POLLOUT;

if (timeout > 0) {
timeout = (timeout + 999) / 1000;
}
do {
rc = poll(&pfd, 1, timeout);
} while (rc == -1 && errno == EINTR);
Expand Down