Skip to content

Commit bd2726d

Browse files
Switch memory contexts in ReinitializeParallelDSM.
We already do this in CreateParallelContext, InitializeParallelDSM, and LaunchParallelWorkers. I suspect the reason why the matching logic was omitted from ReinitializeParallelDSM is that I failed to realize that any memory allocation was happening here -- but shm_mq_attach does allocate, which could result in a shm_mq_handle being allocated in a shorter-lived context than the ParallelContext which points to it. That could result in a crash if the shorter-lived context is freed before the parallel context is destroyed. As far as I am currently aware, there is no way to reach a crash using only code that is present in core PostgreSQL, but extensions could potentially trip over this. Fixing this in the back-branches appears low-risk, so back-patch to all supported versions. Author: Jakub Wartak <jakub.wartak@enterprisedb.com> Co-authored-by: Jeevan Chalke <jeevan.chalke@enterprisedb.com> Backpatch-through: 14 Discussion: http://postgr.es/m/CAKZiRmwfVripa3FGo06=5D1EddpsLu9JY2iJOTgbsxUQ339ogQ@mail.gmail.com
1 parent 95ef6f4 commit bd2726d

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/backend/access/transam/parallel.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,12 @@ InitializeParallelDSM(ParallelContext *pcxt)
492492
void
493493
ReinitializeParallelDSM(ParallelContext *pcxt)
494494
{
495+
MemoryContext oldcontext;
495496
FixedParallelState *fps;
496497

498+
/* We might be running in a very short-lived memory context. */
499+
oldcontext = MemoryContextSwitchTo(TopTransactionContext);
500+
497501
/* Wait for any old workers to exit. */
498502
if (pcxt->nworkers_launched > 0)
499503
{
@@ -531,6 +535,9 @@ ReinitializeParallelDSM(ParallelContext *pcxt)
531535
pcxt->worker[i].error_mqh = shm_mq_attach(mq, pcxt->seg, NULL);
532536
}
533537
}
538+
539+
/* Restore previous memory context. */
540+
MemoryContextSwitchTo(oldcontext);
534541
}
535542

536543
/*

0 commit comments

Comments
 (0)