diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2021-03-08 18:21:51 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2021-03-08 18:21:51 -0500 |
| commit | 8fff8a87493a238b45ecf6635baf334c4051b9df (patch) | |
| tree | f33dcfa0f8d5ff48497ea08bf7487177b76033b4 /src | |
| parent | c267ca682803f8ca233076d216fba18b635238a6 (diff) | |
| download | postgresql-8fff8a87493a238b45ecf6635baf334c4051b9df.tar.gz postgresql-8fff8a87493a238b45ecf6635baf334c4051b9df.zip | |
Validate the OID argument of pg_import_system_collations().
"SELECT pg_import_system_collations(0)" caused an assertion failure.
With a random nonzero argument --- or indeed with zero, in non-assert
builds --- it would happily make pg_collation entries with garbage
values of collnamespace. These are harmless as far as I can tell
(unless maybe the OID happens to become used for a schema, later on?).
In any case this isn't a security issue, since the function is
superuser-only. But it seems like a gotcha for unwary DBAs, so let's
add a check that the given OID belongs to some schema.
Back-patch to v10 where this function was introduced.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/commands/collationcmds.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c index 61e82b050d5..d7deb9ac2fa 100644 --- a/src/backend/commands/collationcmds.c +++ b/src/backend/commands/collationcmds.c @@ -521,14 +521,16 @@ pg_import_system_collations(PG_FUNCTION_ARGS) Oid nspid = PG_GETARG_OID(0); int ncreated = 0; - /* silence compiler warning if we have no locale implementation at all */ - (void) nspid; - if (!superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), (errmsg("must be superuser to import system collations")))); + if (!SearchSysCacheExists1(NAMESPACEOID, ObjectIdGetDatum(nspid))) + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_SCHEMA), + errmsg("schema with OID %u does not exist", nspid))); + /* Load collations known to libc, using "locale -a" to enumerate them */ #ifdef READ_LOCALE_A_OUTPUT { |