diff options
| author | Alexander Korotkov <akorotkov@postgresql.org> | 2024-08-22 09:50:48 +0300 |
|---|---|---|
| committer | Alexander Korotkov <akorotkov@postgresql.org> | 2024-08-22 09:52:54 +0300 |
| commit | f636ab41aba215eaa3303e21a10f12d81357f1f6 (patch) | |
| tree | 0c281591ab46b9140c25f3cdd6f52b7a1612fd8e | |
| parent | 2366ab246a32fa2f10523768926dcf6afe42080f (diff) | |
| download | postgresql-f636ab41aba215eaa3303e21a10f12d81357f1f6.tar.gz postgresql-f636ab41aba215eaa3303e21a10f12d81357f1f6.zip | |
Avoid repeated table name lookups in createPartitionTable()
Currently, createPartitionTable() opens newly created table using its name.
This approach is prone to privilege escalation attack, because we might end
up opening another table than we just created.
This commit address the issue above by opening newly created table by its
OID. It appears to be tricky to get a relation OID out of ProcessUtility().
We have to extend TableLikeClause with new newRelationOid field, which is
filled within ProcessUtility() to be further accessed by caller.
Security: CVE-2014-0062
Reported-by: Noah Misch
Discussion: https://postgr.es/m/20240808171351.a9.nmisch%40google.com
Reviewed-by: Pavel Borisov, Dmitry Koval
| -rw-r--r-- | src/backend/commands/tablecmds.c | 3 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 1 | ||||
| -rw-r--r-- | src/backend/tcop/utility.c | 6 | ||||
| -rw-r--r-- | src/include/nodes/parsenodes.h | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index d219d220691..82dabe636f8 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -20391,6 +20391,7 @@ createPartitionTable(RangeVar *newPartName, Relation modelRel, tlc->options = CREATE_TABLE_LIKE_ALL & ~(CREATE_TABLE_LIKE_INDEXES | CREATE_TABLE_LIKE_IDENTITY | CREATE_TABLE_LIKE_STATISTICS); tlc->relationOid = InvalidOid; + tlc->newRelationOid = InvalidOid; createStmt->tableElts = lappend(createStmt->tableElts, tlc); /* Need to make a wrapper PlannedStmt. */ @@ -20414,7 +20415,7 @@ createPartitionTable(RangeVar *newPartName, Relation modelRel, * Open the new partition with no lock, because we already have * AccessExclusiveLock placed there after creation. */ - newRel = table_openrv(newPartName, NoLock); + newRel = table_open(tlc->newRelationOid, NoLock); /* * We intended to create the partition with the same persistence as the diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index a043fd4c669..f92580c3181 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -4138,6 +4138,7 @@ TableLikeClause: n->relation = $2; n->options = $3; n->relationOid = InvalidOid; + n->newRelationOid = InvalidOid; $$ = (Node *) n; } ; diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index fa66b8017ed..b317c9ae9d6 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -1225,6 +1225,12 @@ ProcessUtilitySlow(ParseState *pstate, morestmts = expandTableLikeClause(table_rv, like); stmts = list_concat(morestmts, stmts); + + /* + * Store the OID of newly created relation to the + * TableLikeClause for the caller to use it. + */ + like->newRelationOid = address.objectId; } else { diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 85a62b538e5..577c4bfef76 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -754,6 +754,7 @@ typedef struct TableLikeClause RangeVar *relation; bits32 options; /* OR of TableLikeOption flags */ Oid relationOid; /* If table has been looked up, its OID */ + Oid newRelationOid; /* OID of newly created table */ } TableLikeClause; typedef enum TableLikeOption |