diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2018-01-28 13:39:07 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2018-01-28 13:39:07 -0500 |
| commit | 35a528062cc8ccdb51bde6c672991ae64e970847 (patch) | |
| tree | 2268ad3b63de072f79d8d00926260b9647874c6e | |
| parent | 010123e144a5a5d395a15067f301a2c2443f49cf (diff) | |
| download | postgresql-35a528062cc8ccdb51bde6c672991ae64e970847.tar.gz | |
Add stack-overflow guards in set-operation planning.
create_plan_recurse lacked any stack depth check. This is not per
our normal coding rules, but I'd supposed it was safe because earlier
planner processing is more complex and presumably should eat more
stack. But bug #15033 from Andrew Grossman shows this isn't true,
at least not for queries having the form of a many-thousand-way
INTERSECT stack.
Further testing showed that recurse_set_operations is also capable
of being crashed in this way, since it likewise will recurse to the
bottom of a parsetree before calling any support functions that
might themselves contain any stack checks. However, its stack
consumption is only perhaps a third of create_plan_recurse's.
It's possible that this particular problem with create_plan_recurse can
only manifest in 9.6 and later, since before that we didn't build a Path
tree for set operations. But having seen this example, I now have no
faith in the proposition that create_plan_recurse doesn't need a stack
check, so back-patch to all supported branches.
Discussion: https://postgr.es/m/20180127050845.28812.58244@wrigleys.postgresql.org
| -rw-r--r-- | src/backend/optimizer/plan/createplan.c | 3 | ||||
| -rw-r--r-- | src/backend/optimizer/prep/prepunion.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 86e7e74793..c46e1318a6 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -358,6 +358,9 @@ create_plan_recurse(PlannerInfo *root, Path *best_path, int flags) { Plan *plan; + /* Guard against stack overflow due to overly complex plans */ + check_stack_depth(); + switch (best_path->pathtype) { case T_SeqScan: diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index e6b15348c1..b586f941a8 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -267,6 +267,9 @@ recurse_set_operations(Node *setOp, PlannerInfo *root, List **pTargetList, double *pNumGroups) { + /* Guard against stack overflow due to overly complex setop nests */ + check_stack_depth(); + if (IsA(setOp, RangeTblRef)) { RangeTblRef *rtr = (RangeTblRef *) setOp; |