[3.14] gh-149816: Fix UAF in Modules/_pickle.c (GH-150024)#153719
Open
nascheme wants to merge 1 commit into
Open
[3.14] gh-149816: Fix UAF in Modules/_pickle.c (GH-150024)#153719nascheme wants to merge 1 commit into
nascheme wants to merge 1 commit into
Conversation
(cherry picked from commit d095ceb) Co-authored-by: Gregory P. Smith <68491+gpshead@users.noreply.github.com> Co-authored-by: Alexey Katsman <alex2007508@gmail.com>
|
All commit authors signed the Contributor License Agreement. |
24 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
gh-149816: Fix UAF in Modules/_pickle.c (GH-150024)
Backport note: 3.14's
batch_list_exact()has the single-item fast path before the batch loop; main moved it inside the loop, which changes the emitted pickle byte stream (APPEND vs MARK ... APPENDS for a trailing single item). To avoid changing 3.14's pickle output, 3.14's structure was kept and only the fix applied: the borrowed PyList_GET_ITEM() + Py_INCREF() became PyList_GetItemRef(), and the list changed size during iteration RuntimeError check was added after each batch. The upstream regression test (test_pickle_dumps_with_concurrent_list_mutations) tolerates RuntimeError/IndexError and passes unchanged.(cherry picked from commit d095ceb)
Co-authored-by: Alexey Katsman alex2007508@gmail.com
Co-authored-by: Gregory P. Smith 68491+gpshead@users.noreply.github.com