Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions Lib/test/test_functools.py
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,40 @@ def f(**kwargs):
with self.assertRaises(RuntimeError):
result = p(**{BadStr("poison"): "new_value"})

def test_call_safety_against_reentrant_mutation(self):
def old_function(*args, **kwargs):
return "old_function", args, kwargs

def new_function(*args, **kwargs):
return "new_function", args, kwargs

g_partial = None

class EvilKey(str):
armed = False
def __hash__(self):
if EvilKey.armed and g_partial is not None:
EvilKey.armed = False
new_args_tuple = ("new_arg",)
new_keywords_dict = {"new_keyword": None}
new_tuple_state = (new_function, new_args_tuple, new_keywords_dict, None)
g_partial.__setstate__(new_tuple_state)
gc.collect()
return str.__hash__(self)

g_partial = functools.partial(old_function, "old_arg", old_keyword=None)

kwargs = {EvilKey("evil_key"): None}
EvilKey.armed = True

result = g_partial(**kwargs)
expected = ("old_function", ("old_arg",), {"old_keyword": None, "evil_key": None})
self.assertEqual(result, expected)

result = g_partial()
expected = ("new_function", ("new_arg",), {"new_keyword": None})
self.assertEqual(result, expected)

@unittest.skipUnless(c_functools, 'requires the C _functools module')
class TestPartialC(TestPartial, unittest.TestCase):
if c_functools:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fixed a potential use-after-free when calling :func:`functools.partial`.
Now, when invoking a :func:`~functools.partial` object, the stored function,
positional arguments, and keyword arguments are preserved for the duration
of the call in case of reentrancy.
49 changes: 29 additions & 20 deletions Modules/_functoolsmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -382,18 +382,24 @@ partial_vectorcall(PyObject *self, PyObject *const *args,
return NULL;
}

PyObject **pto_args = _PyTuple_ITEMS(pto->args);
Py_ssize_t pto_nargs = PyTuple_GET_SIZE(pto->args);
Py_ssize_t pto_nkwds = PyDict_GET_SIZE(pto->kw);
PyObject *result = NULL;
PyObject *partial_function = Py_NewRef(pto->fn);
PyObject *partial_args = Py_NewRef(pto->args);
PyObject *partial_keywords = Py_NewRef(pto->kw);

PyObject **pto_args = _PyTuple_ITEMS(partial_args);
Py_ssize_t pto_nargs = PyTuple_GET_SIZE(partial_args);
Py_ssize_t pto_nkwds = PyDict_GET_SIZE(partial_keywords);
Py_ssize_t nkwds = kwnames == NULL ? 0 : PyTuple_GET_SIZE(kwnames);
Py_ssize_t nargskw = nargs + nkwds;

/* Special cases */
if (!pto_nkwds) {
/* Fast path if we're called without arguments */
if (nargskw == 0) {
return _PyObject_VectorcallTstate(tstate, pto->fn, pto_args,
pto_nargs, NULL);
result = _PyObject_VectorcallTstate(tstate, partial_function, pto_args,
pto_nargs, NULL);
goto done;
}

/* Use PY_VECTORCALL_ARGUMENTS_OFFSET to prepend a single
Expand All @@ -402,10 +408,10 @@ partial_vectorcall(PyObject *self, PyObject *const *args,
PyObject **newargs = (PyObject **)args - 1;
PyObject *tmp = newargs[0];
newargs[0] = pto_args[0];
PyObject *ret = _PyObject_VectorcallTstate(tstate, pto->fn, newargs,
nargs + 1, kwnames);
result = _PyObject_VectorcallTstate(tstate, partial_function, newargs,
nargs + 1, kwnames);
newargs[0] = tmp;
return ret;
goto done;
}
}

Expand Down Expand Up @@ -435,7 +441,8 @@ partial_vectorcall(PyObject *self, PyObject *const *args,
else {
stack = PyMem_Malloc(init_stack_size * sizeof(PyObject *));
if (stack == NULL) {
return PyErr_NoMemory();
PyErr_NoMemory();
goto done;
}
}

Expand All @@ -457,13 +464,13 @@ partial_vectorcall(PyObject *self, PyObject *const *args,
for (Py_ssize_t i = 0; i < nkwds; ++i) {
key = PyTuple_GET_ITEM(kwnames, i);
val = args[nargs + i];
int contains = PyDict_Contains(pto->kw, key);
int contains = PyDict_Contains(partial_keywords, key);
if (contains < 0) {
goto error;
}
else if (contains == 1) {
if (pto_kw_merged == NULL) {
pto_kw_merged = PyDict_Copy(pto->kw);
pto_kw_merged = PyDict_Copy(partial_keywords);
if (pto_kw_merged == NULL) {
goto error;
}
Expand Down Expand Up @@ -496,7 +503,7 @@ partial_vectorcall(PyObject *self, PyObject *const *args,
/* Copy pto_keywords with overlapping call keywords merged
* Note, tail is already coppied. */
Py_ssize_t pos = 0, i = 0;
PyObject *keyword_dict = n_merges ? pto_kw_merged : pto->kw;
PyObject *keyword_dict = n_merges ? pto_kw_merged : partial_keywords;
Py_BEGIN_CRITICAL_SECTION(keyword_dict);
while (PyDict_Next(keyword_dict, &pos, &key, &val)) {
assert(i < pto_nkwds);
Expand All @@ -518,7 +525,8 @@ partial_vectorcall(PyObject *self, PyObject *const *args,
if (stack != small_stack) {
PyMem_Free(stack);
}
return PyErr_NoMemory();
PyErr_NoMemory();
goto done;
}
stack = tmp_stack;
}
Expand Down Expand Up @@ -547,21 +555,22 @@ partial_vectorcall(PyObject *self, PyObject *const *args,
memcpy(stack + pto_nargs, args, nargs * sizeof(PyObject*));
}

PyObject *ret = _PyObject_VectorcallTstate(tstate, pto->fn, stack,
tot_nargs, tot_kwnames);
if (stack != small_stack) {
PyMem_Free(stack);
}
result = _PyObject_VectorcallTstate(tstate, partial_function, stack,
tot_nargs, tot_kwnames);
if (pto_nkwds) {
Py_DECREF(tot_kwnames);
}
return ret;

error:
if (stack != small_stack) {
PyMem_Free(stack);
}
return NULL;

done:
Py_DECREF(partial_function);
Py_DECREF(partial_args);
Py_DECREF(partial_keywords);
return result;
}

/* Set pto->vectorcall depending on the parameters of the partial object */
Expand Down
Loading