1
0
mirror of https://github.com/postgres/postgres.git synced 2025-05-28 05:21:27 +03:00

Fix elog(FATAL) before PostmasterMain() or just after fork().

Since commit 97550c0711972a9856b5db751539bbaf2f88884c, these failed with
"PANIC:  proc_exit() called in child process" due to uninitialized or
stale MyProcPid.  That was reachable if close() failed in
ClosePostmasterPorts() or setlocale(category, "C") failed, both
unlikely.  Back-patch to v13 (all supported versions).

Discussion: https://postgr.es/m/20241208034614.45.nmisch@google.com
This commit is contained in:
Noah Misch 2024-12-10 13:51:59 -08:00
parent 67ef403d0e
commit 4bd9de3f41
4 changed files with 6 additions and 4 deletions

View File

@ -32,6 +32,7 @@
#include "bootstrap/bootstrap.h"
#include "common/username.h"
#include "miscadmin.h"
#include "port/atomics.h"
#include "postmaster/postmaster.h"
#include "tcop/tcopprot.h"
@ -96,6 +97,7 @@ main(int argc, char *argv[])
* localization of messages may not work right away, and messages won't go
* anywhere but stderr until GUC settings get loaded.
*/
MyProcPid = getpid();
MemoryContextInit();
/*

View File

@ -19,6 +19,7 @@
#include <unistd.h>
#include "libpq/pqsignal.h"
#include "miscadmin.h"
#include "postmaster/fork_process.h"
#ifndef WIN32
@ -66,6 +67,7 @@ fork_process(void)
if (result == 0)
{
/* fork succeeded, in child */
MyProcPid = getpid();
#ifdef LINUX_PROFILE
setitimer(ITIMER_PROF, &prof_itimer, NULL);
#endif

View File

@ -2024,14 +2024,13 @@ ClosePostmasterPorts(bool am_syslogger)
/*
* InitProcessGlobals -- set MyProcPid, MyStartTime[stamp], random seeds
* InitProcessGlobals -- set MyStartTime[stamp], random seeds
*
* Called early in the postmaster and every backend.
*/
void
InitProcessGlobals(void)
{
MyProcPid = getpid();
MyStartTimestamp = GetCurrentTimestamp();
MyStartTime = timestamptz_to_time_t(MyStartTimestamp);

View File

@ -74,8 +74,7 @@ static volatile pqsigfunc pqsignal_handlers[PG_NSIG];
/*
* Except when called with SIG_IGN or SIG_DFL, pqsignal() sets up this function
* as the handler for all signals. This wrapper handler function checks that
* it is called within a process that the server knows about (i.e., any process
* that has called InitProcessGlobals(), such as a client backend), and not a
* it is called within a process that knew to maintain MyProcPid, and not a
* child process forked by system(3), etc. This check ensures that such child
* processes do not modify shared memory, which is often detrimental. If the
* check succeeds, the function originally provided to pqsignal() is called.