git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix possible crashes due to using elog/ereport too early in startup.

2014年1月11日 21:35:26 +0000 (16:35 -0500)

2014年1月11日 21:36:07 +0000 (16:36 -0500)

Per reports from Andres Freund and Luke Campbell, a server failure during
set_pglocale_pgservice results in a segfault rather than a useful error
message, because the infrastructure needed to use ereport hasn't been
initialized; specifically, MemoryContextInit hasn't been called.
One known cause of this is starting the server in a directory it
doesn't have permission to read.

We could try to prevent set_pglocale_pgservice from using anything that
depends on palloc or elog, but that would be messy, and the odds of future
breakage seem high. Moreover there are other things being called in main.c
that look likely to use palloc or elog too --- perhaps those things
shouldn't be there, but they are there today. The best solution seems to
be to move the call of MemoryContextInit to very early in the backend's
real main() function. I've verified that an elog or ereport occurring
immediately after that is now capable of sending something useful to
stderr.

I also added code to elog.c to print something intelligible rather than
just crashing if MemoryContextInit hasn't created the ErrorContext.
This could happen if MemoryContextInit itself fails (due to malloc
failure), and provides some future-proofing against someone trying to
sneak in new code even earlier in server startup.

Back-patch to all supported branches. Since we've only heard reports of
this type of failure recently, it may be that some recent change has made
it more likely to see a crash of this kind; but it sure looks like it's
broken all the way back.

src/backend/bootstrap/bootstrap.c patch | blob | blame | history

src/backend/main/main.c patch | blob | blame | history

src/backend/postmaster/postmaster.c patch | blob | blame | history

src/backend/tcop/postgres.c patch | blob | blame | history

src/backend/utils/error/elog.c patch | blob | blame | history

src/backend/utils/mmgr/mcxt.c patch | blob | blame | history

diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c

index 7d4e24fa30a745f114219358a81fd68b92304ffb..ef6311b075b8eb4829872e273f2d013079922cad 100644 (file)

--- a/src/backend/bootstrap/bootstrap.c

+++ b/src/backend/bootstrap/bootstrap.c

@@ -202,14 +202,6 @@ AuxiliaryProcessMain(int argc, char *argv[])

MyStartTime = time(NULL);

- /*

- * Fire up essential subsystems: error and memory management

- *

- * If we are running under the postmaster, this is done already.

- */

- if (!IsUnderPostmaster)

- MemoryContextInit();

/* Compute paths, if we didn't inherit them from postmaster */

if (my_exec_path[0] == '0円')

{

diff --git a/src/backend/main/main.c b/src/backend/main/main.c

index 4ee8a153d93cd30cb7b28197339764a12ea0ea4a..98da177de94e38e0fd16cf16d065ba773be7011d 100644 (file)

--- a/src/backend/main/main.c

+++ b/src/backend/main/main.c

@@ -39,6 +39,7 @@

#include "postmaster/postmaster.h"

#include "tcop/tcopprot.h"

#include "utils/help_config.h"

+#include "utils/memutils.h"

#include "utils/pg_locale.h"

#include "utils/ps_status.h"

@@ -85,6 +86,15 @@ main(int argc, char *argv[])

pgwin32_install_crashdump_handler();

#endif

+ /*

+ * Fire up essential subsystems: error and memory management

+ *

+ * Code after this point is allowed to use elog/ereport, though

+ * localization of messages may not work right away, and messages won't go

+ * anywhere but stderr until GUC settings get loaded.

+ */

+ MemoryContextInit();

* Set up locale information from environment. Note that LC_CTYPE and

* LC_COLLATE will be overridden later from pg_control if we are in an

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c

index a7e40cc4a5989953ecb6398f1265498ddf99e0eb..23f4ada7b95b2b326be7c8e0c768135f9951b1e5 100644 (file)

--- a/src/backend/postmaster/postmaster.c

+++ b/src/backend/postmaster/postmaster.c

@@ -560,11 +560,6 @@ PostmasterMain(int argc, char *argv[])

umask(S_IRWXG | S_IRWXO);

- /*

- * Fire up essential subsystems: memory management

- */

- MemoryContextInit();

* By default, palloc() requests in the postmaster will be allocated in

* the PostmasterContext, which is space that can be recycled by backends.

@@ -4468,7 +4463,6 @@ SubPostmasterMain(int argc, char *argv[])

whereToSendOutput = DestNone;

/* Setup essential subsystems (to ensure elog() behaves sanely) */

- MemoryContextInit();

InitializeGUCOptions();

/* Read in the variables file */

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c

index dcd8cdf3c192409ebf83437250b85c53b0d31ca7..b7612b9b5f7c3ac324bc632b5985694c9c40649e 100644 (file)

--- a/src/backend/tcop/postgres.c

+++ b/src/backend/tcop/postgres.c

@@ -3548,14 +3548,6 @@ PostgresMain(int argc, char *argv[],

MyStartTime = time(NULL);

}

- /*

- * Fire up essential subsystems: error and memory management

- *

- * If we are running under the postmaster, this is done already.

- */

- if (!IsUnderPostmaster)

- MemoryContextInit();

SetProcessingMode(InitProcessing);

/* Compute paths, if we didn't inherit them from postmaster */

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c

index 3de162b9d53efa83b7a28cdd78ff2574406dde31..8705586d5659415ce9ce7df3f656f2f222ada292 100644 (file)

--- a/src/backend/utils/error/elog.c

+++ b/src/backend/utils/error/elog.c

@@ -310,6 +310,18 @@ errstart(int elevel, const char *filename, int lineno,

if (elevel < ERROR && !output_to_server && !output_to_client)

return false;

+ /*

+ * We need to do some actual work. Make sure that memory context

+ * initialization has finished, else we can't do anything useful.

+ */

+ if (ErrorContext == NULL)

+ {

+ /* Ooops, hard crash time; very little we can do safely here */

+ write_stderr("error occurred at %s:%d before error message processing is available\n",

+ filename ? filename : "(unknown file)", lineno);

+ exit(2);

+ }

* Okay, crank up a stack entry to store the info in.

@@ -1238,6 +1250,15 @@ elog_start(const char *filename, int lineno, const char *funcname)

{

ErrorData *edata;

+ /* Make sure that memory context initialization has finished */

+ if (ErrorContext == NULL)

+ {

+ /* Ooops, hard crash time; very little we can do safely here */

+ write_stderr("error occurred at %s:%d before error message processing is available\n",

+ filename ? filename : "(unknown file)", lineno);

+ exit(2);

+ }

if (++errordata_stack_depth >= ERRORDATA_STACK_SIZE)

{

diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c

index b60ca90d0a384e94027877cb26c663819a05ab7c..7b089f77df8aa6aab95168afe04f31ae6400486a 100644 (file)

--- a/src/backend/utils/mmgr/mcxt.c

+++ b/src/backend/utils/mmgr/mcxt.c

@@ -72,7 +72,8 @@ static void MemoryContextStatsInternal(MemoryContext context, int level);

* In normal multi-backend operation, this is called once during

* postmaster startup, and not at all by individual backend startup

* (since the backends inherit an already-initialized context subsystem

- * by virtue of being forked off the postmaster).

+ * by virtue of being forked off the postmaster). But in an EXEC_BACKEND

+ * build, each process must do this for itself.

* In a standalone backend this must be called during backend startup.

@@ -106,6 +107,9 @@ MemoryContextInit(void)

* where retained memory in a context is *essential* --- we want to be

* sure ErrorContext still has some memory even if we've run out

* elsewhere!

+ *

+ * This should be the last step in this function, as elog.c assumes memory

+ * management works once ErrorContext is non-null.

ErrorContext = AllocSetContextCreate(TopMemoryContext,

"ErrorContext",

This is the main PostgreSQL git repository.

RSS Atom