Skip to content

Fix use-after-free in QuicRangeRemoveRange middle-split path #5882

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
guhetier wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −1
Open

Fix use-after-free in QuicRangeRemoveRange middle-split path #5882

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
6 changes: 5 additions & 1 deletion src/core/range.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,11 +428,15 @@ QuicRangeRemoveRange(
// and the second part will be handled by the "left edge
// overlaps" case.
//
// Save Sub's value before MakeSpace, which may reallocate
// and free the old SubRanges array, invalidating Sub.
//
QUIC_SUBRANGE OldSub = *Sub;
QUIC_SUBRANGE* NewSub = QuicRangeMakeSpace(Range, &i);
if (NewSub == NULL) {
return FALSE;
}
*NewSub = *Sub;
*NewSub = OldSub;
Sub = NewSub;
}

Expand Down
30 changes: 30 additions & 0 deletions src/core/unittest/RangeTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,3 +787,33 @@ TEST(RangeTest, SearchRangeThree)
ASSERT_EQ(index, 2);
#endif
}

TEST(RangeTest, RemoveRangeMiddleSplitWithGrow)
{
SmartRange range;

//
// Fill to AllocLength=16 (heap-allocated) so a middle-split
// triggers Grow, which frees the old SubRanges array.
//
range.Add(100, 100); // [100..199] at index 0, will be split
for (uint32_t i = 1; i <= 15; i++) {
range.Add(1000 + i * 100);
}
ASSERT_EQ(range.ValidCount(), 16u);

//
// Remove [140..159] from middle of [100..199]. Splits into
// [100..139] and [160..199], requiring 17 slots -> Grow.
//
ASSERT_TRUE(QuicRangeRemoveRange(&range.range, 140, 20));
ASSERT_EQ(range.ValidCount(), 17u);

auto sub0 = QuicRangeGet(&range.range, 0);
ASSERT_EQ(sub0->Low, 100ull);
ASSERT_EQ(sub0->Count, 40ull);

auto sub1 = QuicRangeGet(&range.range, 1);
ASSERT_EQ(sub1->Low, 160ull);
ASSERT_EQ(sub1->Count, 40ull);
}
Loading