bio fix: pass flags on BIO_ctrl to make flush retriable#21298
Closed
ihciah wants to merge 1 commit intoopenssl:masterfrom
Closed
bio fix: pass flags on BIO_ctrl to make flush retriable#21298ihciah wants to merge 1 commit intoopenssl:masterfrom
ihciah wants to merge 1 commit intoopenssl:masterfrom
Conversation
Co-authored-by: suikammd <suikalala@gmail.com>
paulidale
approved these changes
Jun 27, 2023
Collaborator
|
This PR is in a state where it requires action by @openssl/committers but the last update was 30 days ago |
Contributor
Author
|
Hi everyone, is everything alright? |
mattcaswell
approved these changes
Aug 2, 2023
Collaborator
|
This pull request is ready to merge |
Contributor
|
Merged to |
openssl-machine
pushed a commit
that referenced
this pull request
Aug 4, 2023
Co-authored-by: suikammd <suikalala@gmail.com> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Todd Short <todd.short@me.com> (Merged from #21298)
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
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.
This PR fixed a wrong wbio pointer usage on SSL_get_error.
The bug will cause
SSL_get_errorto returnSSL_ERROR_SYSCALLeven afterBIO_set_retry_writein some cases such asBIO_CTRL_FLUSH. Without this fix, whenBIO_CTRL_FLUSH, if BIO writer gets aWOULD_BLOCKerror, it callsBIO_set_retry_writeand returns 0, it will not work and openssl will return a failure.Previous review is in #20919 , I reopened this PR to trigger CLA checking.