Skip to content

Validate stream receive buffer size #6302

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

Open
Gaurav Singh (gaurav2699) wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −5
Open

Validate stream receive buffer size #6302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 3 deletions src/core/settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,13 @@ QuicSettingApply(
const QUIC_SETTINGS_INTERNAL* Source
)
{
if (Source->IsSet.StreamRecvBufferDefault &&
(!Destination->IsSet.StreamRecvBufferDefault || OverWrite) &&
(!IS_POWER_OF_TWO(Source->StreamRecvBufferDefault) ||
Source->StreamRecvBufferDefault < QUIC_DEFAULT_STREAM_RECV_BUFFER_SIZE)) {
return FALSE;
}

if (Source->IsSet.SendBufferingEnabled && (!Destination->IsSet.SendBufferingEnabled || OverWrite)) {
Destination->SendBufferingEnabled = Source->SendBufferingEnabled;
Destination->IsSet.SendBufferingEnabled = TRUE;
Expand Down Expand Up @@ -577,9 +584,6 @@ QuicSettingApply(
Destination->IsSet.StreamRecvWindowUnidiDefault = TRUE;
}
if (Source->IsSet.StreamRecvBufferDefault && (!Destination->IsSet.StreamRecvBufferDefault || OverWrite)) {
if (Source->StreamRecvBufferDefault < QUIC_DEFAULT_STREAM_RECV_BUFFER_SIZE) {
return FALSE;
}
Destination->StreamRecvBufferDefault = Source->StreamRecvBufferDefault;
Destination->IsSet.StreamRecvBufferDefault = TRUE;
}
Expand Down
15 changes: 15 additions & 0 deletions src/core/unittest/SettingsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,21 @@ TEST(SettingsTest, StreamRecvWindowDefaultGetsOverridenByIndividualLimits)
ASSERT_EQ(Destination.StreamRecvWindowUnidiDefault, Source.StreamRecvWindowUnidiDefault);
}

TEST(SettingsTest, StreamRecvBufferDefaultRejectsInvalidSizesWithoutChanges)
{
QUIC_SETTINGS_INTERNAL Source;
QUIC_SETTINGS_INTERNAL Destination;
CxPlatZeroMemory(&Source, sizeof(Source));
CxPlatZeroMemory(&Destination, sizeof(Destination));
QuicSettingsSetDefault(&Destination);

Source.IsSet.StreamRecvBufferDefault = 1;
Source.StreamRecvBufferDefault = QUIC_DEFAULT_STREAM_RECV_BUFFER_SIZE + 1;

ASSERT_FALSE(QuicSettingApply(&Destination, TRUE, TRUE, &Source));
ASSERT_EQ(Destination.StreamRecvBufferDefault, QUIC_DEFAULT_STREAM_RECV_BUFFER_SIZE);
}

// TEST(SettingsTest, TestAllVersionSettingsFieldsGet)
// {
// QUIC_VERSION_SETTINGS Settings;
Expand Down
8 changes: 6 additions & 2 deletions src/test/lib/ApiTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2066,8 +2066,12 @@ void SettingApplyTests(HQUIC Handle, uint32_t Param, bool AllowMtuEcnChanges = t
}

{
struct TestSpec Spec[] = {{0, QUIC_STATUS_INVALID_PARAMETER},
{QUIC_DEFAULT_STREAM_RECV_BUFFER_SIZE, QUIC_STATUS_SUCCESS}};
struct TestSpec Spec[] = {
{0, QUIC_STATUS_INVALID_PARAMETER},
{QUIC_DEFAULT_STREAM_RECV_BUFFER_SIZE + 1, QUIC_STATUS_INVALID_PARAMETER},
{QUIC_DEFAULT_STREAM_RECV_BUFFER_SIZE, QUIC_STATUS_SUCCESS},
{2 * QUIC_DEFAULT_STREAM_RECV_BUFFER_SIZE, QUIC_STATUS_SUCCESS}
};
QUIC_SETTINGS Settings{0};
Settings.IsSet.StreamRecvBufferDefault = TRUE;
for (auto &Data: Spec) {
Expand Down
Loading