Fix GH-13860: Incorrect PHP_STREAM_OPTION_CHECK_LIVENESS case in ext/openssl/xp_ssl.c - causing use of dead socket#13895
Closed
ndossche wants to merge 1 commit intophp:PHP-8.2from
Closed
Fix GH-13860: Incorrect PHP_STREAM_OPTION_CHECK_LIVENESS case in ext/openssl/xp_ssl.c - causing use of dead socket#13895ndossche wants to merge 1 commit intophp:PHP-8.2from
ndossche wants to merge 1 commit intophp:PHP-8.2from
Conversation
…xt/openssl/xp_ssl.c - causing use of dead socket php_socket_errno() may return a stale value when recv returns a value >= 0. As such, the liveness check is wrong. This is the same bug as #70198 (fixed in phpGH-1456). So we fix it in the same way.
bukka
approved these changes
Apr 7, 2024
Member
bukka
left a comment
bukka
left a comment
There was a problem hiding this comment.
Looks good to me. I also run the test and it is correct as well! Well done! ;)
| int err; | ||
|
|
||
| ret = recv(sslsock->s.socket, &buf, sizeof(buf), MSG_PEEK|MSG_DONTWAIT); | ||
| err = php_socket_errno(); |
Member
There was a problem hiding this comment.
not sure if we need to always call it (e.g. when ret is positive) but it's not a big deal as it's just errno assignment on non Win or quick WSAGetLastError call on Win. I see you took it from xp_socket so it's fine to leave as it is.
Member
Author
There was a problem hiding this comment.
Yeah it probably doesn't matter too much in practice... I'll make a follow-up for master that changes this in xp_ssl and xp_socket, and we can see from there.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
php_socket_errno() may return a stale value when recv returns a value >= 0. As such, the liveness check is wrong.
This is the same bug as #70198 (fixed in GH-1456). So we fix it in the same way.