open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Acquire ControlFileLock in relevant SQL functions.

Browse Source 
Commit dc7d70ea added functions that read the control file, but didn't
acquire ControlFileLock.  With unlucky timing, file systems that have
weak interlocking like ext4 and ntfs could expose partially overwritten
contents, and the checksum would fail.

Back-patch to all supported releases.

Reviewed-by: David Steele <david@pgmasters.net>
Reviewed-by: Anton A. Melnikov <aamelnikov@inbox.ru>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/20221123014224.xisi44byq3cf5psi%40awork3.anarazel.de
pull/150/head
Thomas Munro 2 years ago
parent bf1c21c4fa
commit 2371432cd6
1 changed files with 9 additions and 0 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      src/backend/utils/misc/pg_controldata.c

9
src/backend/utils/misc/pg_controldata.c
Unescape View File

@ -24,6 +24,7 @@
#include "common/controldata_utils.h" #include "common/controldata_utils.h"
#include "funcapi.h" #include "funcapi.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "storage/lwlock.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/pg_lsn.h" #include "utils/pg_lsn.h"
#include "utils/timestamp.h" #include "utils/timestamp.h"
@ -42,7 +43,9 @@ pg_control_system(PG_FUNCTION_ARGS)
elog(ERROR, "return type must be a row type"); elog(ERROR, "return type must be a row type");
/* read the control file */ /* read the control file */
LWLockAcquire(ControlFileLock, LW_SHARED);
ControlFile = get_controlfile(DataDir, &crc_ok); ControlFile = get_controlfile(DataDir, &crc_ok);
LWLockRelease(ControlFileLock);
if (!crc_ok) if (!crc_ok)
ereport(ERROR, ereport(ERROR,
(errmsg("calculated CRC checksum does not match value stored in file"))); (errmsg("calculated CRC checksum does not match value stored in file")));
@ -80,7 +83,9 @@ pg_control_checkpoint(PG_FUNCTION_ARGS)
elog(ERROR, "return type must be a row type"); elog(ERROR, "return type must be a row type");
/* Read the control file. */ /* Read the control file. */
LWLockAcquire(ControlFileLock, LW_SHARED);
ControlFile = get_controlfile(DataDir, &crc_ok); ControlFile = get_controlfile(DataDir, &crc_ok);
LWLockRelease(ControlFileLock);
if (!crc_ok) if (!crc_ok)
ereport(ERROR, ereport(ERROR,
(errmsg("calculated CRC checksum does not match value stored in file"))); (errmsg("calculated CRC checksum does not match value stored in file")));
@ -169,7 +174,9 @@ pg_control_recovery(PG_FUNCTION_ARGS)
elog(ERROR, "return type must be a row type"); elog(ERROR, "return type must be a row type");
/* read the control file */ /* read the control file */
LWLockAcquire(ControlFileLock, LW_SHARED);
ControlFile = get_controlfile(DataDir, &crc_ok); ControlFile = get_controlfile(DataDir, &crc_ok);
LWLockRelease(ControlFileLock);
if (!crc_ok) if (!crc_ok)
ereport(ERROR, ereport(ERROR,
(errmsg("calculated CRC checksum does not match value stored in file"))); (errmsg("calculated CRC checksum does not match value stored in file")));
@ -208,7 +215,9 @@ pg_control_init(PG_FUNCTION_ARGS)
elog(ERROR, "return type must be a row type"); elog(ERROR, "return type must be a row type");
/* read the control file */ /* read the control file */
LWLockAcquire(ControlFileLock, LW_SHARED);
ControlFile = get_controlfile(DataDir, &crc_ok); ControlFile = get_controlfile(DataDir, &crc_ok);
LWLockRelease(ControlFileLock);
if (!crc_ok) if (!crc_ok)
ereport(ERROR, ereport(ERROR,
(errmsg("calculated CRC checksum does not match value stored in file"))); (errmsg("calculated CRC checksum does not match value stored in file")));

Write Preview
Loading…
Cancel
Save