Fix dangling pointer in EvalPlanQual machinery.

EvalPlanQualStart() supposed that it could re-use the relsubs_rowmark
and relsubs_done arrays from a prior instantiation.  But since they are
allocated in the es_query_cxt of the recheckestate, that's just wrong;
EvalPlanQualEnd() will blow away that storage.  Therefore we were using
storage that could have been reallocated to something else, causing all
sorts of havoc.

I think this was modeled on the old code's handling of es_epqTupleSlot,
but since the code was anyway clearing the arrays at re-use, there's
clearly no expectation of importing any outside state.  So it's just
a dubious savings of a couple of pallocs, which is negligible compared
to setting up a new planstate tree.  Therefore, just allocate the
arrays always.  (I moved the allocations slightly for readability.)

In principle this bug could cause a problem whenever EPQ rechecks are
needed in more than one target table of a ModifyTable plan node.
In practice it seems not quite so easy to trigger as that; I couldn't
readily duplicate a crash with a partitioned target table, for instance.
That's probably down to incidental choices about when to free or
reallocate stuff.  The added isolation test case does seem to reliably
show an assertion failure, though.

Per report from Oleksii Kliukin.  Back-patch to v12 where the bug was
introduced (evidently by commit 3fb307bc4).

Discussion: https://postgr.es/m/EEF05F66-2871-4786-992B-5F45C92FEE2E@hintbits.com

diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 3a9ce992a3b28c18271199fc90bf088c2a176de9..ee5c3a60ff324094e794abc5a8108de35bc2881b 100644 (file)
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -2887,33 +2887,13 @@ EvalPlanQualStart(EPQState *epqstate, Plan *planTree)
                                             subplanstate);
    }
 
-   /*
-    * These arrays are reused across different plans set with
-    * EvalPlanQualSetPlan(), which is safe because they all use the same
-    * parent EState. Therefore we can reuse if already allocated.
-    */
-   if (epqstate->relsubs_rowmark == NULL)
-   {
-       Assert(epqstate->relsubs_done == NULL);
-       epqstate->relsubs_rowmark = (ExecAuxRowMark **)
-           palloc0(rtsize * sizeof(ExecAuxRowMark *));
-       epqstate->relsubs_done = (bool *)
-           palloc0(rtsize * sizeof(bool));
-   }
-   else
-   {
-       Assert(epqstate->relsubs_done != NULL);
-       memset(epqstate->relsubs_rowmark, 0,
-              rtsize * sizeof(ExecAuxRowMark *));
-       memset(epqstate->relsubs_done, 0,
-              rtsize * sizeof(bool));
-   }
-
    /*
     * Build an RTI indexed array of rowmarks, so that
     * EvalPlanQualFetchRowMark() can efficiently access the to be fetched
     * rowmark.
     */
+   epqstate->relsubs_rowmark = (ExecAuxRowMark **)
+       palloc0(rtsize * sizeof(ExecAuxRowMark *));
    foreach(l, epqstate->arowMarks)
    {
        ExecAuxRowMark *earm = (ExecAuxRowMark *) lfirst(l);
@@ -2921,6 +2901,12 @@ EvalPlanQualStart(EPQState *epqstate, Plan *planTree)
        epqstate->relsubs_rowmark[earm->rowmark->rti - 1] = earm;
    }
 
+   /*
+    * Initialize per-relation EPQ tuple states to not-fetched.
+    */
+   epqstate->relsubs_done = (bool *)
+       palloc0(rtsize * sizeof(bool));
+
    /*
     * Initialize the private state information for all the nodes in the part
     * of the plan tree we need to run.  This opens files, allocates storage
@@ -2989,7 +2975,9 @@ EvalPlanQualEnd(EPQState *epqstate)
    FreeExecutorState(estate);
 
    /* Mark EPQState idle */
+   epqstate->origslot = NULL;
    epqstate->recheckestate = NULL;
    epqstate->recheckplanstate = NULL;
-   epqstate->origslot = NULL;
+   epqstate->relsubs_rowmark = NULL;
+   epqstate->relsubs_done = NULL;
 }

diff --git a/src/test/isolation/expected/eval-plan-qual.out b/src/test/isolation/expected/eval-plan-qual.out
index 65d3a5f0ae461ae80e7f91ae6fd753b06d01c6e5..3e55a55c6347f8567af78bad1165cf931cb22237 100644 (file)
--- a/src/test/isolation/expected/eval-plan-qual.out
+++ b/src/test/isolation/expected/eval-plan-qual.out
@@ -673,6 +673,13 @@ a              b              c
 2              3              0              
 step c2: COMMIT;
 
+starting permutation: writep3a writep3b c1 c2
+step writep3a: UPDATE p SET b = -b WHERE c = 0;
+step writep3b: UPDATE p SET b = -b WHERE c = 0; <waiting ...>
+step c1: COMMIT;
+step writep3b: <... completed>
+step c2: COMMIT;
+
 starting permutation: wx2 partiallock c2 c1 read
 step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance;
 balance        

diff --git a/src/test/isolation/specs/eval-plan-qual.spec b/src/test/isolation/specs/eval-plan-qual.spec
index 222195873ac98f327df4df62c3f5eb72206fefab..70fa320fc4da44996900b560eb49863e777cf8c5 100644 (file)
--- a/src/test/isolation/specs/eval-plan-qual.spec
+++ b/src/test/isolation/specs/eval-plan-qual.spec
@@ -97,10 +97,12 @@ step "upsert1"  {
 # readp1/writep1/readp2 tests a bug where nodeLockRows did the wrong thing
 # when the first updated tuple was in a non-first child table.
 # writep2/returningp1 tests a memory allocation issue
+# writep3a/writep3b tests updates touching more than one table
 
 step "readp1"  { SELECT tableoid::regclass, ctid, * FROM p WHERE b IN (0, 1) AND c = 0 FOR UPDATE; }
 step "writep1" { UPDATE p SET b = -1 WHERE a = 1 AND b = 1 AND c = 0; }
 step "writep2" { UPDATE p SET b = -b WHERE a = 1 AND c = 0; }
+step "writep3a"    { UPDATE p SET b = -b WHERE c = 0; }
 step "c1"  { COMMIT; }
 step "r1"  { ROLLBACK; }
 
@@ -203,6 +205,7 @@ step "returningp1" {
    WITH u AS ( UPDATE p SET b = b WHERE a > 0 RETURNING * )
      SELECT * FROM u;
 }
+step "writep3b"    { UPDATE p SET b = -b WHERE c = 0; }
 step "readforss"   {
    SELECT ta.id AS ta_id, ta.value AS ta_value,
        (SELECT ROW(tb.id, tb.value)
@@ -338,6 +341,7 @@ permutation "wx1" "delwctefail" "c1" "c2" "read"
 permutation "upsert1" "upsert2" "c1" "c2" "read"
 permutation "readp1" "writep1" "readp2" "c1" "c2"
 permutation "writep2" "returningp1" "c1" "c2"
+permutation "writep3a" "writep3b" "c1" "c2"
 permutation "wx2" "partiallock" "c2" "c1" "read"
 permutation "wx2" "lockwithvalues" "c2" "c1" "read"
 permutation "wx2_ext" "partiallock_ext" "c2" "c1" "read_ext"