Skip to content

Commit ea42ccb

Browse files
committed
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.
1 parent 25b1372 commit ea42ccb

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/backend/commands/collationcmds.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,14 +502,16 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
502502
Oid nspid = PG_GETARG_OID(0);
503503
int ncreated = 0;
504504

505-
/* silence compiler warning if we have no locale implementation at all */
506-
(void) nspid;
507-
508505
if (!superuser())
509506
ereport(ERROR,
510507
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
511508
(errmsg("must be superuser to import system collations"))));
512509

510+
if (!SearchSysCacheExists1(NAMESPACEOID, ObjectIdGetDatum(nspid)))
511+
ereport(ERROR,
512+
(errcode(ERRCODE_UNDEFINED_SCHEMA),
513+
errmsg("schema with OID %u does not exist", nspid)));
514+
513515
/* Load collations known to libc, using "locale -a" to enumerate them */
514516
#ifdef READ_LOCALE_A_OUTPUT
515517
{

0 commit comments

Comments
 (0)