extmod/modussl_mbedtls: Consider mbedtls buffer when poll()'ing #6865
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
This commit fixes a bug where a poll() for read would not consider bytes available internally within the mbedtls_ssl's application data record read buffer. The bug would trigger if the caller's previous read() only retreived a portion of the bytes available, then called poll(). In spite of the wrapped socket being immediately readable, the poll() would incorrectly block (or timeout) because it was passing the poll ioctl down to the raw socket and waiting for additional encrypted data to arrive on the raw socket. The fix checks for bytes available via the mbedtls_ssl_get_bytes_avail() call before handing down to the raw socket. Signed-off-by: Johnathan York <jayork@quazam.org>
4342176 to
ebf3522
Compare
|
Thanks for the contribution, but I'll close this is favour of #5840. |
Wind-stormger
pushed a commit
to BPI-STEAM/micropython
that referenced
this pull request
Sep 8, 2022
…n-main Translations update from Hosted Weblate
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 commit fixes a bug where a poll() for read would not consider
bytes available internally within the mbedtls_ssl's application data
record read buffer. The bug would trigger if the caller's previous
read() only retreived a portion of the bytes available, then called
poll(). In spite of the wrapped socket being immediately readable, the
poll() would incorrectly block (or timeout) because it was passing
the poll ioctl down to the raw socket and waiting for additional
encrypted data to arrive on the raw socket.
The fix checks for bytes available via the
mbedtls_ssl_get_bytes_avail() call before handing down to the raw
socket.