Skip to content
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

Jump to bottom

bpo-45648: Add checks for tp_version_tag in specialize.c #29272

Closed
wants to merge 5 commits into from
Closed

bpo-45648: Add checks for tp_version_tag in specialize.c #29272

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9746066
Add checks for tp_version
Fidget-Spinner Oct 28, 2021
307d6c6
Merge remote-tracking branch 'upstream/main' into add_checks_tp_version
Fidget-Spinner Dec 15, 2021
ba81186
Add tests after analyze_descriptor, also wrap in easy-to-use macro
Fidget-Spinner Dec 15, 2021
66c75a2
Merge remote-tracking branch 'upstream/main' into add_checks_tp_version
Fidget-Spinner Dec 15, 2021
a73336c
add version check for specialize_class_call
Fidget-Spinner Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 33 additions & 1 deletion Python/specialize.c
View file
Open in desktop
Expand Up @@ -501,6 +501,21 @@ initial_counter_value(void) {
#define SPEC_FAIL_NOT_FOLLOWED_BY_COND_JUMP 14
#define SPEC_FAIL_BIG_INT 15

static inline int
invalid_tp_version(int opcode, PyTypeObject *type)
{
if (!_PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG)) {
SPECIALIZATION_FAIL(opcode, SPEC_FAIL_OUT_OF_VERSIONS);
return 1;
}
return 0;
}

#ifndef INVALID_TP_VERSION
#define INVALID_TP_VERSION(opcode, type) \
invalid_tp_version(opcode, ((PyTypeObject *)(type)))
#endif

static int
specialize_module_load_attr(
PyObject *owner, _Py_CODEUNIT *instr, PyObject *name,
Expand Down Expand Up @@ -700,6 +715,9 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, Sp
}
PyObject *descr;
DesciptorClassification kind = analyze_descriptor(type, name, &descr, 0);
if (INVALID_TP_VERSION(LOAD_ATTR, type)) {
goto fail;
}
switch(kind) {
case OVERRIDING:
SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OVERRIDING_DESCRIPTOR);
Expand Down Expand Up @@ -789,6 +807,9 @@ _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, S
}
PyObject *descr;
DesciptorClassification kind = analyze_descriptor(type, name, &descr, 1);
if (INVALID_TP_VERSION(STORE_ATTR, type)) {
goto fail;
}
switch(kind) {
case OVERRIDING:
SPECIALIZATION_FAIL(STORE_ATTR, SPEC_FAIL_OVERRIDING_DESCRIPTOR);
Expand Down Expand Up @@ -900,10 +921,12 @@ static int
specialize_class_load_method(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name,
_PyAttrCache *cache1, _PyObjectCache *cache2)
{

PyObject *descr = NULL;
DesciptorClassification kind = 0;
kind = analyze_descriptor((PyTypeObject *)owner, name, &descr, 0);
if (INVALID_TP_VERSION(LOAD_METHOD, owner)) {
return -1;
}
switch (kind) {
case METHOD:
case NON_DESCRIPTOR:
Expand Down Expand Up @@ -952,6 +975,9 @@ _Py_Specialize_LoadMethod(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name,
PyObject *descr = NULL;
DesciptorClassification kind = 0;
kind = analyze_descriptor(owner_cls, name, &descr, 0);
if (INVALID_TP_VERSION(LOAD_METHOD, owner_cls)) {
goto fail;
}
assert(descr != NULL || kind == ABSENT || kind == GETSET_OVERRIDDEN);
if (kind != METHOD) {
SPECIALIZATION_FAIL(LOAD_METHOD, load_method_fail_kind(kind));
Expand Down Expand Up @@ -1175,6 +1201,9 @@ _Py_Specialize_BinarySubscr(
}
PyTypeObject *cls = Py_TYPE(container);
PyObject *descriptor = _PyType_LookupId(cls, &PyId___getitem__);
if (INVALID_TP_VERSION(BINARY_SUBSCR, cls)) {
goto fail;
}
if (descriptor && Py_TYPE(descriptor) == &PyFunction_Type) {
PyFunctionObject *func = (PyFunctionObject *)descriptor;
PyCodeObject *code = (PyCodeObject *)func->func_code;
Expand Down Expand Up @@ -1267,6 +1296,9 @@ specialize_class_call(
{
assert(PyType_Check(callable));
PyTypeObject *tp = (PyTypeObject *)callable;
if (INVALID_TP_VERSION(CALL_NO_KW, tp)) {
return -1;
}
if (_Py_OPCODE(instr[-1]) == PRECALL_METHOD) {
SPECIALIZATION_FAIL(CALL_NO_KW, SPEC_FAIL_METHOD_CALL_CLASS);
return -1;
Expand Down