Skip to content

[release/7.0] Ensure free buffer space when reading TLS messages #83574

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

Merged
rzikm merged 4 commits into from
Apr 3, 2023
Merged

[release/7.0] Ensure free buffer space when reading TLS messages #83574

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9782377
Ensure free buffer space when reading TLS messages
rzikm Mar 15, 2023
9ac03e7
Move buffer expansion outside of the loop to prevent unbounded grow
rzikm Mar 16, 2023
08ea2e4
Fix failing tests
rzikm Mar 16, 2023
1026dd2
Remove unwanted changes
rzikm Mar 21, 2023
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
10 changes: 9 additions & 1 deletion src/libraries/System.Net.Security/src/System/Net/Security/SslStream.IO.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,10 +684,18 @@ private async ValueTask<int> EnsureFullTlsFrameAsync<TIOAdapter>(CancellationTok
return frameSize;
}

if (frameSize < int.MaxValue)
if (frameSize != int.MaxValue)
Copy link
Member

@karelz karelz Mar 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is it needed? Looks like semantically it is the same. Only MaxValue can be "not <".

Copy link
Member

@rzikm rzikm Mar 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed, it was part of stylistic change to make it evident that int.MaxValue is a special value ("unknown size"). I can remove it from the backport.

{
// make sure we have space for the whole frame
_buffer.EnsureAvailableSpace(frameSize - _buffer.EncryptedLength);
}
else
{
// move existing data to the beginning of the buffer (they will
// be couple of bytes only, otherwise we would have entire
// header and know exact size)
_buffer.EnsureAvailableSpace(_buffer.Capacity - _buffer.EncryptedLength);
}

while (_buffer.EncryptedLength < frameSize)
{
Expand Down