FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.15] gh-149816: Fix UAF in Modules/_pickle.c (GH-150024) by nascheme · Pull Request #153718 · python/cpython · GitHub

/ cpython Public
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .c  (1) .py  (1) .rst  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
34 changes: 34 additions & 0 deletions Lib/test/test_free_threading/test_pickle.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,39 @@ def mutator():
with threading_helper.start_threads(threads):
pass

def test_pickle_dumps_with_concurrent_list_mutations(self):
# gh-149816: Pickling a list while another thread mutates it
# used to be a UAF in free-threaded mode. batch_list_exact()
# used PyList_GET_ITEM (borrowed) followed by Py_INCREF, and a
# concurrent replace/pop could free the item between those two
# operations.
shared = [list(range(20)) for _ in range(50)]

def dumper():
for _ in range(1000):
try:
pickle.dumps(shared)
except (RuntimeError, IndexError):
pass

def mutator():
for i in range(1000):
idx = i % 50
shared[idx] = list(range(i % 20))
if i % 10 == 0:
try:
shared.pop()
except IndexError:
pass
shared.append([i])

threads = []
for _ in range(10):
threads.append(threading.Thread(target=dumper))
threads.append(threading.Thread(target=mutator))

with threading_helper.start_threads(threads):
pass

if __name__ == "__main__":
unittest.main()
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a potential use after free condition in :func:`pickle.dumps` in free-threaded
mode when serializing lists.
29 changes: 21 additions & 8 deletions Modules/_pickle.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -3191,7 +3191,7 @@ static int
batch_list_exact(PickleState *state, PicklerObject *self, PyObject *obj)
{
PyObject *item = NULL;
Py_ssize_t this_batch, total;
Py_ssize_t this_batch, total, list_size;

const char append_op = APPEND;
const char appends_op = APPENDS;
Expand All @@ -3200,14 +3200,18 @@ batch_list_exact(PickleState *state, PicklerObject *self, PyObject *obj)
assert(obj != NULL);
assert(self->proto > 0);
assert(PyList_CheckExact(obj));
assert(PyList_GET_SIZE(obj));

list_size = PyList_GET_SIZE(obj);

/* Write in batches of BATCHSIZE. */
total = 0;
do {
if (PyList_GET_SIZE(obj) - total == 1) {
item = PyList_GET_ITEM(obj, total);
Py_INCREF(item);
if (list_size - total == 1) {
item = PyList_GetItemRef(obj, total);
if (item == NULL) {
_PyErr_FormatNote("when serializing %T item %zd", obj, total);
return -1;
}
int err = save(state, self, item, 0);
Py_DECREF(item);
if (err < 0) {
Expand All @@ -3222,8 +3226,11 @@ batch_list_exact(PickleState *state, PicklerObject *self, PyObject *obj)
if (_Pickler_Write(self, &mark_op, 1) < 0)
return -1;
while (total < PyList_GET_SIZE(obj)) {
item = PyList_GET_ITEM(obj, total);
Py_INCREF(item);
item = PyList_GetItemRef(obj, total);
if (item == NULL) {
_PyErr_FormatNote("when serializing %T item %zd", obj, total);
return -1;
}
int err = save(state, self, item, 0);
Py_DECREF(item);
if (err < 0) {
Expand All @@ -3236,8 +3243,14 @@ batch_list_exact(PickleState *state, PicklerObject *self, PyObject *obj)
}
if (_Pickler_Write(self, &appends_op, 1) < 0)
return -1;
if (PyList_GET_SIZE(obj) != list_size) {
PyErr_Format(
PyExc_RuntimeError,
"list changed size during iteration");
return -1;
}

} while (total < PyList_GET_SIZE(obj));
} while (total < list_size);

return 0;
}
Expand Down
Loading

Back | FazBrowse Home | New Git URL