aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2019-06-10 23:20:48 -0700
committerAndres Freund <andres@anarazel.de>2019-06-10 23:34:50 -0700
commitfff2a7d7bd09db38e1bafc1303c29b10a9805dc0 (patch)
tree724fe00c2aacf594793904fdec9d1cc1b211878d /src
parent92a88644d2b7208e98d9e913c3a574c5c2fe7b78 (diff)
downloadpostgresql-fff2a7d7bd09db38e1bafc1303c29b10a9805dc0.tar.gz
postgresql-fff2a7d7bd09db38e1bafc1303c29b10a9805dc0.zip
Don't access catalogs to validate GUCs when not connected to a DB.
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-
Diffstat (limited to 'src')
-rw-r--r--src/backend/access/table/tableamapi.c8
-rw-r--r--src/backend/commands/tablespace.c14
-rw-r--r--src/backend/utils/cache/ts_cache.c8
3 files changed, 18 insertions, 12 deletions
diff --git a/src/backend/access/table/tableamapi.c b/src/backend/access/table/tableamapi.c
index 34e6a4f20de..fdd7e64ada8 100644
--- a/src/backend/access/table/tableamapi.c
+++ b/src/backend/access/table/tableamapi.c
@@ -18,6 +18,7 @@
#include "catalog/pg_am.h"
#include "catalog/pg_proc.h"
#include "commands/defrem.h"
+#include "miscadmin.h"
#include "utils/fmgroids.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
@@ -119,10 +120,11 @@ check_default_table_access_method(char **newval, void **extra, GucSource source)
}
/*
- * If we aren't inside a transaction, we cannot do database access so
- * cannot verify the name. Must accept the value on faith.
+ * If we aren't inside a transaction, or not connected to a database, we
+ * cannot do the catalog access necessary to verify the method. Must
+ * accept the value on faith.
*/
- if (IsTransactionState())
+ if (IsTransactionState() && MyDatabaseId != InvalidOid)
{
if (!OidIsValid(get_table_am_oid(*newval, true)))
{
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 87fab52d83f..5e43867e6f9 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -1069,10 +1069,11 @@ bool
check_default_tablespace(char **newval, void **extra, GucSource source)
{
/*
- * If we aren't inside a transaction, we cannot do database access so
- * cannot verify the name. Must accept the value on faith.
+ * If we aren't inside a transaction, or connected to a database, we
+ * 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' &&
!OidIsValid(get_tablespace_oid(*newval, true)))
@@ -1190,11 +1191,12 @@ check_temp_tablespaces(char **newval, void **extra, GucSource source)
}
/*
- * If we aren't inside a transaction, we cannot do database access so
- * cannot verify the individual names. Must accept the list on faith.
+ * If we aren't inside a transaction, or connected to a database, we
+ * 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.
*/
- if (IsTransactionState())
+ if (IsTransactionState() && MyDatabaseId != InvalidOid)
{
temp_tablespaces_extra *myextra;
Oid *tblSpcs;
diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c
index 0545efc75bb..68c04d87d51 100644
--- a/src/backend/utils/cache/ts_cache.c
+++ b/src/backend/utils/cache/ts_cache.c
@@ -38,6 +38,7 @@
#include "catalog/pg_ts_parser.h"
#include "catalog/pg_ts_template.h"
#include "commands/defrem.h"
+#include "miscadmin.h"
#include "tsearch/ts_cache.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
@@ -590,10 +591,11 @@ bool
check_TSCurrentConfig(char **newval, void **extra, GucSource source)
{
/*
- * If we aren't inside a transaction, we cannot do database access so
- * cannot verify the config name. Must accept it on faith.
+ * If we aren't inside a transaction, or connected to a database, we
+ * cannot do the catalog accesses necessary to verify the config name.
+ * Must accept it on faith.
*/
- if (IsTransactionState())
+ if (IsTransactionState() && MyDatabaseId != InvalidOid)
{
Oid cfgId;
HeapTuple tuple;