[BTS-2216] Fix use-after-free in prepareQuery #21929
Open
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Scope & Purpose
A use-after-free in prepareQuery, introduced in #21080.
Since #21080,
Query::prepareQuery
is a coroutine, but its callerQuery::execute
still returns WAITING for suspension. This was translated, so thatprepareQuery
finished caused a wakeup, resumingexecute
. Mostly, no other wakeups can occur during that time; but for a kill, which can trigger a wakeup if the query has DBServer snippets, and cause the query to be destroyed whileprepareQuery
is still running.In this PR,
Query::execute
is refactored into a coroutine to prevent this race. The WAITING->coro glue code is therefore moved from theRestCursorHandler
intoexecute
. Additional cases for synchronous calls (Query::executeSync
) are now necessary in the same places, to avoid needing additional threads.Checklist
There was no release since its introduction, so no changelog entry nor backports.
Related Information