Fix socket_recvfrom overflow on buffer size. #16382
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
devnexen
force-pushed
the
socket_recv_overflow
branch
from
ab7afe8 to
85f45d1
Compare
devnexen
force-pushed
the
socket_recv_overflow
branch
from
85f45d1 to
e40cde0
Compare
nielsdos
requested changes
Oct 12, 2024
| --EXTENSIONS-- | ||
| sockets | ||
| --FILE-- | ||
| <?php |
There was a problem hiding this comment.
Test fails on Windows, also a bit of a weird indentation: normally we don't indent tests outer scope?
There was a problem hiding this comment.
yes that was just quick copy paste from my local messy test :)
| @@ -1402,7 +1402,8 @@ PHP_FUNCTION(socket_recvfrom) | |||
|
|
|||
| /* overflow check */ | |||
| /* Shouldthrow ? */ | |||
| if ((arg3 + 2) < 3) { | |||
|
|
|||
| if (arg3 <= 0 || arg3 > ZEND_LONG_MAX - 1) { | |||
There was a problem hiding this comment.
The original code also intended to disallow ZEND_LONG_MAX-1, not sure why. I think what you did is fine though.
when passing PHP_INT_MAX for the $length param we get this (with ubsan) `ext/sockets/sockets.c:1409:36: runtime error: signed integer overflow: 9223372036854775807 + 1 cannot be represented in type 'long int'`
devnexen
force-pushed
the
socket_recv_overflow
branch
from
e40cde0 to
3a861aa
Compare
nielsdos
approved these changes
Oct 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
when passing PHP_INT_MAX for the $length param we get this (with ubsan)
ext/sockets/sockets.c:1409:36: runtime error: signed integer overflow: 9223372036854775807 + 1 cannot be represented in type 'long int'