bpo-46709: fix race condition by adding CHECK_EVAL_BREAKER in CALL_NO_KW_* opcode

sobolevn · sobolevn · commit fe82471db5d6 · 2022-02-11T15:32:19.000+03:00
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -4690,6 +4690,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             Py_DECREF(obj);
             STACK_SHRINK(call_shape.postcall_shrink);
             SET_TOP(res);
+            CHECK_EVAL_BREAKER();
             NOTRACE_DISPATCH();
         }
 
@@ -4710,6 +4711,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             if (res == NULL) {
                 goto error;
             }
+            CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 
@@ -4729,6 +4731,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             if (res == NULL) {
                 goto error;
             }
+            CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 
@@ -4753,6 +4756,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             if (res == NULL) {
                 goto error;
             }
+            CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 
@@ -4784,6 +4788,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             if (res == NULL) {
                 goto error;
             }
+            CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 
@@ -4822,6 +4827,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
                 */
                 goto error;
             }
+            CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 
@@ -4864,6 +4870,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             if (res == NULL) {
                 goto error;
             }
+            CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 
@@ -4895,6 +4902,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             if (res == NULL) {
                 goto error;
             }
+            CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 
@@ -4928,6 +4936,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             if (res == NULL) {
                 goto error;
             }
+            CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 
@@ -4952,6 +4961,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             Py_INCREF(Py_None);
             SET_TOP(Py_None);
             Py_DECREF(call_shape.callable);
+            CHECK_EVAL_BREAKER();
             NOTRACE_DISPATCH();
         }
 
@@ -4981,6 +4991,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             if (res == NULL) {
                 goto error;
             }
+            CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 
@@ -5008,6 +5019,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             if (res == NULL) {
                 goto error;
             }
+            CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 
@@ -5035,6 +5047,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             if (res == NULL) {
                 goto error;
             }
+            CHECK_EVAL_BREAKER();
             DISPATCH();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -4690,6 +4690,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`4690`	`4690`	`Py_DECREF(obj);`
`4691`	`4691`	`STACK_SHRINK(call_shape.postcall_shrink);`
`4692`	`4692`	`SET_TOP(res);`
	`4693`	`+ CHECK_EVAL_BREAKER();`
`4693`	`4694`	`NOTRACE_DISPATCH();`
`4694`	`4695`	`}`
`4695`	`4696`
`@@ -4710,6 +4711,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`4710`	`4711`	`if (res == NULL) {`
`4711`	`4712`	`goto error;`
`4712`	`4713`	`}`
	`4714`	`+ CHECK_EVAL_BREAKER();`
`4713`	`4715`	`DISPATCH();`
`4714`	`4716`	`}`
`4715`	`4717`
`@@ -4729,6 +4731,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`4729`	`4731`	`if (res == NULL) {`
`4730`	`4732`	`goto error;`
`4731`	`4733`	`}`
	`4734`	`+ CHECK_EVAL_BREAKER();`
`4732`	`4735`	`DISPATCH();`
`4733`	`4736`	`}`
`4734`	`4737`
`@@ -4753,6 +4756,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`4753`	`4756`	`if (res == NULL) {`
`4754`	`4757`	`goto error;`
`4755`	`4758`	`}`
	`4759`	`+ CHECK_EVAL_BREAKER();`
`4756`	`4760`	`DISPATCH();`
`4757`	`4761`	`}`
`4758`	`4762`
`@@ -4784,6 +4788,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`4784`	`4788`	`if (res == NULL) {`
`4785`	`4789`	`goto error;`
`4786`	`4790`	`}`
	`4791`	`+ CHECK_EVAL_BREAKER();`
`4787`	`4792`	`DISPATCH();`
`4788`	`4793`	`}`
`4789`	`4794`
`@@ -4822,6 +4827,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`4822`	`4827`	`*/`
`4823`	`4828`	`goto error;`
`4824`	`4829`	`}`
	`4830`	`+ CHECK_EVAL_BREAKER();`
`4825`	`4831`	`DISPATCH();`
`4826`	`4832`	`}`
`4827`	`4833`
`@@ -4864,6 +4870,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`4864`	`4870`	`if (res == NULL) {`
`4865`	`4871`	`goto error;`
`4866`	`4872`	`}`
	`4873`	`+ CHECK_EVAL_BREAKER();`
`4867`	`4874`	`DISPATCH();`
`4868`	`4875`	`}`
`4869`	`4876`
`@@ -4895,6 +4902,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`4895`	`4902`	`if (res == NULL) {`
`4896`	`4903`	`goto error;`
`4897`	`4904`	`}`
	`4905`	`+ CHECK_EVAL_BREAKER();`
`4898`	`4906`	`DISPATCH();`
`4899`	`4907`	`}`
`4900`	`4908`
`@@ -4928,6 +4936,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`4928`	`4936`	`if (res == NULL) {`
`4929`	`4937`	`goto error;`
`4930`	`4938`	`}`
	`4939`	`+ CHECK_EVAL_BREAKER();`
`4931`	`4940`	`DISPATCH();`
`4932`	`4941`	`}`
`4933`	`4942`
`@@ -4952,6 +4961,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`4952`	`4961`	`Py_INCREF(Py_None);`
`4953`	`4962`	`SET_TOP(Py_None);`
`4954`	`4963`	`Py_DECREF(call_shape.callable);`
	`4964`	`+ CHECK_EVAL_BREAKER();`
`4955`	`4965`	`NOTRACE_DISPATCH();`
`4956`	`4966`	`}`
`4957`	`4967`
`@@ -4981,6 +4991,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`4981`	`4991`	`if (res == NULL) {`
`4982`	`4992`	`goto error;`
`4983`	`4993`	`}`
	`4994`	`+ CHECK_EVAL_BREAKER();`
`4984`	`4995`	`DISPATCH();`
`4985`	`4996`	`}`
`4986`	`4997`
`@@ -5008,6 +5019,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`5008`	`5019`	`if (res == NULL) {`
`5009`	`5020`	`goto error;`
`5010`	`5021`	`}`
	`5022`	`+ CHECK_EVAL_BREAKER();`
`5011`	`5023`	`DISPATCH();`
`5012`	`5024`	`}`
`5013`	`5025`
`@@ -5035,6 +5047,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, InterpreterFrame frame, int thr`
`5035`	`5047`	`if (res == NULL) {`
`5036`	`5048`	`goto error;`
`5037`	`5049`	`}`
	`5050`	`+ CHECK_EVAL_BREAKER();`
`5038`	`5051`	`DISPATCH();`
`5039`	`5052`	`}`
`5040`	`5053`