mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't access catalogs to validate GUCs when not connected to a DB.

Browse Source 
Vignesh found this bug in the check function for
default_table_access_method's check hook, but that was just copied
from older GUCs. Investigation by Michael and me then found the bug in
further places.

When not connected to a database (e.g. in a walsender connection), we
cannot perform (most) GUC checks that need database access. Even when
only shared tables are needed, unless they're
nailed (c.f. RelationCacheInitializePhase2()), they cannot be accessed
without pg_class etc. being present.

Fix by extending the existing IsTransactionState() checks to also
check for MyDatabaseOid.

Reported-By: Vignesh C, Michael Paquier, Andres Freund
Author: Vignesh C, Andres Freund
Discussion: https://postgr.es/m/CALDaNm1KXK9gbZfY-p_peRFm_XrBh1OwQO1Kk6Gig0c0fVZ2uw%40mail.gmail.com
Backpatch: 9.4-
This commit is contained in:
Andres Freund 2019-06-10 23:20:48 -07:00
parent 6a781c4f5f
commit c015560176
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/commands/tablespace.c
View File

@ -1064,10 +1064,11 @@ bool
check_default_tablespace(char **newval, void **extra, GucSource source) check_default_tablespace(char **newval, void **extra, GucSource source)
{ {
/* /*
* If we aren't inside a transaction, we cannot do database access so * If we aren't inside a transaction, or connected to a database, we
* cannot verify the name. Must accept the value on faith. * cannot do the catalog accesses necessary to verify the name. Must
* accept the value on faith.
*/ */
if (IsTransactionState()) if (IsTransactionState() && MyDatabaseId != InvalidOid)
{ {
if (**newval != '\0' && if (**newval != '\0' &&
!OidIsValid(get_tablespace_oid(*newval, true))) !OidIsValid(get_tablespace_oid(*newval, true)))
@ -1175,11 +1176,12 @@ check_temp_tablespaces(char **newval, void **extra, GucSource source)
} }
/* /*
* If we aren't inside a transaction, we cannot do database access so * If we aren't inside a transaction, or connected to a database, we
* cannot verify the individual names. Must accept the list on faith. * cannot do the catalog accesses necessary to verify the name. Must
* accept the value on faith.
* Fortunately, there's then also no need to pass the data to fd.c. * Fortunately, there's then also no need to pass the data to fd.c.
*/ */
if (IsTransactionState()) if (IsTransactionState() && MyDatabaseId != InvalidOid)
{ {
temp_tablespaces_extra *myextra; temp_tablespaces_extra *myextra;
Oid *tblSpcs; Oid *tblSpcs;

8
src/backend/utils/cache/ts_cache.c vendored
View File

@ -38,6 +38,7 @@
#include "catalog/pg_ts_parser.h" #include "catalog/pg_ts_parser.h"
#include "catalog/pg_ts_template.h" #include "catalog/pg_ts_template.h"
#include "commands/defrem.h" #include "commands/defrem.h"
#include "miscadmin.h"
#include "tsearch/ts_cache.h" #include "tsearch/ts_cache.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/catcache.h" #include "utils/catcache.h"
@ -591,10 +592,11 @@ bool
check_TSCurrentConfig(char **newval, void **extra, GucSource source) check_TSCurrentConfig(char **newval, void **extra, GucSource source)
{ {
/* /*
* If we aren't inside a transaction, we cannot do database access so * If we aren't inside a transaction, or connected to a database, we
* cannot verify the config name. Must accept it on faith. * cannot do the catalog accesses necessary to verify the config name.
* Must accept it on faith.
*/ */
if (IsTransactionState()) if (IsTransactionState() && MyDatabaseId != InvalidOid)
{ {
Oid cfgId; Oid cfgId;
HeapTuple tuple; HeapTuple tuple;