Skip to content

Fix double deref in connection pool error path #5597

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
merged 4 commits into from
Nov 19, 2025
Merged

Fix double deref in connection pool error path #5597

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd29b80
Fix double deref in connection pool error path
guhetier Nov 18, 2025
8b6a412
Move variable decl to top of function
guhetier Nov 18, 2025
3f547f9
Improve comment
guhetier Nov 18, 2025
5e8f7bb
Fix typo
guhetier Nov 18, 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
58 changes: 49 additions & 9 deletions src/core/connection_pool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,39 @@
return Status;
}

//
// Queue a close operation on the connection worker thread,
// optionally waiting for its completion.
//
static
_IRQL_requires_max_(PASSIVE_LEVEL)
void
QuicConnPoolQueueConnectionClose(
_In_ QUIC_CONNECTION* Connection,
_In_ const BOOLEAN WaitForCompletion
)
{
Connection->CloseOper.Type = QUIC_OPER_TYPE_API_CALL;
Connection->CloseOper.FreeAfterProcess = FALSE;
Connection->CloseOper.API_CALL.Context = &Connection->CloseApiContext;
Connection->CloseApiContext.Type = QUIC_API_TYPE_CONN_CLOSE;
Connection->CloseApiContext.Status = NULL;

CXPLAT_EVENT CompletionEvent = {0};
if (WaitForCompletion) {
CxPlatEventInitialize(&CompletionEvent, TRUE, FALSE);
Connection->CloseApiContext.Completed = &CompletionEvent;
}

QuicConnQueueOper(Connection, &Connection->CloseOper);

if (WaitForCompletion) {
CxPlatEventWaitForever(CompletionEvent);
CxPlatEventUninitialize(CompletionEvent);
}
}


static
_IRQL_requires_max_(PASSIVE_LEVEL)
QUIC_STATUS
Expand Down Expand Up @@ -359,11 +392,12 @@

if (QUIC_FAILED(Status) && *Connection != NULL) {
//
// This connection has never left MsQuic back to the application,
// so don't send any notifications to the application on close.
// This connection has never left MsQuic back to the application.
// Mark it as internally owned so no notification is sent to the app,
// the closing logic will handle the final deref.
//
(*Connection)->State.ExternalOwner = FALSE;
MsQuicConnectionClose((HQUIC)*Connection);
QuicConnPoolQueueConnectionClose(*Connection, FALSE);
*Connection = NULL;
}

Expand Down Expand Up @@ -673,13 +707,19 @@
}

CleanUpConnections:
if (QUIC_FAILED(Status) &&
(Config->Flags & QUIC_CONNECTION_POOL_FLAG_CLOSE_ON_FAILURE) != 0) {
for (uint32_t i = 0; i < CreatedConnections; i++) {
MsQuicConnectionClose((HQUIC)Connections[i]);
Connections[i] = NULL;
if (QUIC_FAILED(Status) &&
(Config->Flags & QUIC_CONNECTION_POOL_FLAG_CLOSE_ON_FAILURE) != 0) {

//
// Close every connection that was created.
// The application will receive the shutdown notification.
//
for (uint32_t i = 0; i < CreatedConnections; i++) {
QuicConnPoolQueueConnectionClose(Connections[i], TRUE);
QuicConnRelease(Connections[i], QUIC_CONN_REF_HANDLE_OWNER);
Connections[i] = NULL;
}
}
}

Error:
if (ServerNameCopy != NULL) {
Expand Down
Loading