Skip to content

bpo-46709: check eval breaker in specialized CALL opcodes #31404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markshannon merged 3 commits into from
Feb 18, 2022
Merged

bpo-46709: check eval breaker in specialized CALL opcodes #31404

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aaa5071
bpo-46709: fix race condition by adding `CHECK_EVAL_BREAKER` in `CALL…
sobolevn Feb 11, 2022
7723bfa
Add tests to be sure that it does not happen again
sobolevn Feb 18, 2022
c90682e
Address review
sobolevn Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
bpo-46709: fix race condition by adding CHECK_EVAL_BREAKER in `CALL… 
…_NO_KW_*` opcode
  • Loading branch information
@sobolevn
sobolevn committed Feb 18, 2022
commit aaa5071383e0422fc990c6af5961181b4621eff3
13 changes: 13 additions & 0 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4722,6 +4722,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
Py_DECREF(obj);
STACK_SHRINK(call_shape.postcall_shrink);
SET_TOP(res);
CHECK_EVAL_BREAKER();
Comment thread
sobolevn marked this conversation as resolved.
Outdated
NOTRACE_DISPATCH();
}

Expand All @@ -4742,6 +4743,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
DISPATCH();
}

Expand All @@ -4761,6 +4763,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
DISPATCH();
}

Expand All @@ -4785,6 +4788,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
DISPATCH();
}

Expand Down Expand Up @@ -4816,6 +4820,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
DISPATCH();
}

Expand Down Expand Up @@ -4854,6 +4859,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
*/
goto error;
}
CHECK_EVAL_BREAKER();
DISPATCH();
}

Expand Down Expand Up @@ -4896,6 +4902,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
DISPATCH();
}

Expand Down Expand Up @@ -4927,6 +4934,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
Comment thread
sobolevn marked this conversation as resolved.
Outdated
DISPATCH();
}

Expand Down Expand Up @@ -4960,6 +4968,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
Comment thread
sobolevn marked this conversation as resolved.
Outdated
DISPATCH();
}

Expand All @@ -4984,6 +4993,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();
Comment thread
sobolevn marked this conversation as resolved.
Outdated
NOTRACE_DISPATCH();
}

Expand Down Expand Up @@ -5013,6 +5023,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
DISPATCH();
}

Expand Down Expand Up @@ -5040,6 +5051,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
DISPATCH();
}

Expand Down Expand Up @@ -5067,6 +5079,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
DISPATCH();
}

Expand Down