Skip to content

Io\Poll\Context::wait() prevent integer overflow #23468

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
marc-mabe wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −2
Open

Io\Poll\Context::wait() prevent integer overflow #23468

Show file tree
Hide file tree
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
7 changes: 5 additions & 2 deletions ext/standard/io_poll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,12 +804,15 @@ PHP_METHOD(Io_Poll_Context, wait)
if (max_events <= 0) {
max_events = 64;
}
} else if (max_events <= 0) {
} else if (UNEXPECTED(max_events <= 0)) {
zend_argument_value_error(2, "must be greater than 0");
RETURN_THROWS();
} else if (ZEND_LONG_INT_OVFL(max_events)) {
zend_argument_value_error(2, "must be less than or equal to %d", INT_MAX);
RETURN_THROWS();
}

php_poll_event *events = safe_emalloc(max_events, sizeof(*events), 0);
php_poll_event *events = safe_emalloc((size_t) max_events, sizeof(*events), 0);
int num_events = php_poll_wait(intern->ctx, events, (int) max_events, timeout ? &timeout_ts : NULL);

if (num_events < 0) {
Expand Down
14 changes: 14 additions & 0 deletions ext/standard/tests/poll/poll_ctx_wait.phpt → ...ndard/tests/poll/poll_ctx_wait_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,27 @@ try {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

try {
$poll_ctx->wait(maxEvents: PHP_INT_MIN);
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

try {
$poll_ctx->wait(maxEvents: -1);
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

try {
$poll_ctx->wait(maxEvents: 0);
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

?>
--EXPECT--
ValueError: Io\Poll\Context::wait(): Argument #1 ($timeout) must not be negative
ValueError: Io\Poll\Context::wait(): Argument #2 ($maxEvents) must be greater than 0
ValueError: Io\Poll\Context::wait(): Argument #2 ($maxEvents) must be greater than 0
ValueError: Io\Poll\Context::wait(): Argument #2 ($maxEvents) must be greater than 0
23 changes: 23 additions & 0 deletions ext/standard/tests/poll/poll_ctx_wait_error_int64.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
Io\Poll\Context::wait(): Parameter validation upper limit
--SKIPIF--
<?php
if (PHP_INT_SIZE <= 4) {
die("skip this test is for > 32bit platforms only");
}
?>
--FILE--
<?php
require_once __DIR__ . '/poll.inc';

$poll_ctx = new Io\Poll\Context();

try {
$poll_ctx->wait(maxEvents: PHP_INT_MAX);
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}

?>
--EXPECT--
ValueError: Io\Poll\Context::wait(): Argument #2 ($maxEvents) must be less than or equal to 2147483647
Loading