Skip to content

Add null checks for CXPLAT_ALLOC_NONPAGED and CxPlatPoolAlloc calls #5326

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
wants to merge 2 commits into
base: main
Choose a base branch
from
+24 −0
Open

Add null checks for CXPLAT_ALLOC_NONPAGED and CxPlatPoolAlloc calls #5326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99e8587
Initial plan
Copilot Aug 5, 2025
9f2dc72
Add null checks for CXPLAT_ALLOC_NONPAGED and CxPlatPoolAlloc calls
Copilot Aug 5, 2025
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
17 changes: 17 additions & 0 deletions src/core/unittest/RecvBufferTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ struct RecvBuffer {
PreallocChunk = (QUIC_RECV_CHUNK*)CXPLAT_ALLOC_NONPAGED(
sizeof(QUIC_RECV_CHUNK) + AllocBufferLength,
QUIC_POOL_RECVBUF); // Use the recv buffer pool tag as this memory is moved to the recv buffer.
if (PreallocChunk == nullptr) {
return QUIC_STATUS_OUT_OF_MEMORY;
}
QuicRecvChunkInitialize(PreallocChunk, AllocBufferLength, (uint8_t*)(PreallocChunk + 1), FALSE);
}
printf("Initializing: [mode=%u,vlen=%u,alen=%u]\n", RecvMode, VirtualBufferLength, AllocBufferLength);
Expand All @@ -75,11 +78,25 @@ struct RecvBuffer {
CXPLAT_LIST_ENTRY ChunkList;
CxPlatListInitializeHead(&ChunkList);
AppOwnedBuffer = (uint8_t *)CXPLAT_ALLOC_NONPAGED(VirtualBufferLength, QUIC_POOL_TEST);
if (AppOwnedBuffer == nullptr) {
return QUIC_STATUS_OUT_OF_MEMORY;
}
auto* Chunk = (QUIC_RECV_CHUNK *)CxPlatPoolAlloc(&AppBufferChunkPool);
if (Chunk == nullptr) {
CXPLAT_FREE(AppOwnedBuffer, QUIC_POOL_TEST);
AppOwnedBuffer = nullptr;
return QUIC_STATUS_OUT_OF_MEMORY;
}
QuicRecvChunkInitialize(Chunk, AllocBufferLength, AppOwnedBuffer, TRUE);
CxPlatListInsertHead(&ChunkList, &Chunk->Link);
if (VirtualBufferLength > AllocBufferLength) {
auto* Chunk2 = (QUIC_RECV_CHUNK *)CxPlatPoolAlloc(&AppBufferChunkPool);
if (Chunk2 == nullptr) {
CxPlatPoolFree(Chunk);
CXPLAT_FREE(AppOwnedBuffer, QUIC_POOL_TEST);
AppOwnedBuffer = nullptr;
return QUIC_STATUS_OUT_OF_MEMORY;
}
QuicRecvChunkInitialize(Chunk2, VirtualBufferLength - AllocBufferLength, AppOwnedBuffer + AllocBufferLength, TRUE);
CxPlatListInsertTail(&ChunkList, &Chunk2->Link);
}
Expand Down
4 changes: 4 additions & 0 deletions src/perf/lib/Tcp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,10 @@ bool TcpConnection::InitializeTls()
{
const uint32_t LocalTPLength = 2;
uint8_t* LocalTP = (uint8_t*)CXPLAT_ALLOC_NONPAGED(CxPlatTlsTPHeaderSize + LocalTPLength, QUIC_POOL_TLS_TRANSPARAMS);
if (LocalTP == nullptr) {
WriteOutput("LocalTP allocation failed\n");
return false;
}
CxPlatZeroMemory(LocalTP, LocalTPLength);

CXPLAT_TLS_CONFIG Config;
Expand Down
3 changes: 3 additions & 0 deletions src/platform/unittest/TlsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,9 @@ struct TlsTest : public ::testing::TestWithParam<bool>
if (Context->ReceivedSessionTicket.Buffer == nullptr) {
Context->ReceivedSessionTicket.Buffer = // N.B - Add one so we don't ever allocate zero bytes.
(uint8_t*)CXPLAT_ALLOC_NONPAGED(TicketLength+1, QUIC_POOL_CRYPTO_RESUMPTION_TICKET);
if (Context->ReceivedSessionTicket.Buffer == nullptr) {
return FALSE;
}
Context->ReceivedSessionTicket.Length = TicketLength;
if (TicketLength != 0) {
CxPlatCopyMemory(
Expand Down