Commit 415ffdc2 authored by Tom Lane's avatar Tom Lane

Don't run RelationInitTableAccessMethod in a long-lived context.

Some code paths in this function perform syscache lookups, which
can lead to table accesses and possibly leakage of cruft into
the caller's context.  If said context is CacheMemoryContext,
we eventually will have visible bloat.  But fixing this is no
harder than moving one memory context switch step.  (The other
callers don't have a problem.)

Andres Freund and I independently found this via valgrind testing.
Back-patch to v12 where this code was added.

Discussion: https://postgr.es/m/20210317023101.anvejcfotwka6gaa@alap3.anarazel.de
Discussion: https://postgr.es/m/3816764.1616104288@sss.pgh.pa.us
parent 28644fac
...@@ -3543,6 +3543,13 @@ RelationBuildLocalRelation(const char *relname, ...@@ -3543,6 +3543,13 @@ RelationBuildLocalRelation(const char *relname,
rel->rd_rel->relam = accessmtd; rel->rd_rel->relam = accessmtd;
/*
* RelationInitTableAccessMethod will do syscache lookups, so we mustn't
* run it in CacheMemoryContext. Fortunately, the remaining steps don't
* require a long-lived current context.
*/
MemoryContextSwitchTo(oldcxt);
if (relkind == RELKIND_RELATION || if (relkind == RELKIND_RELATION ||
relkind == RELKIND_SEQUENCE || relkind == RELKIND_SEQUENCE ||
relkind == RELKIND_TOASTVALUE || relkind == RELKIND_TOASTVALUE ||
...@@ -3566,11 +3573,6 @@ RelationBuildLocalRelation(const char *relname, ...@@ -3566,11 +3573,6 @@ RelationBuildLocalRelation(const char *relname,
*/ */
EOXactListAdd(rel); EOXactListAdd(rel);
/*
* done building relcache entry.
*/
MemoryContextSwitchTo(oldcxt);
/* It's fully valid */ /* It's fully valid */
rel->rd_isvalid = true; rel->rd_isvalid = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment