ICU-23352 Fix race condition UAF in uprv_collation_root_cleanup#3921
Open
hirorogo wants to merge 1 commit intounicode-org:maint/maint-54from
Open
ICU-23352 Fix race condition UAF in uprv_collation_root_cleanup#3921hirorogo wants to merge 1 commit intounicode-org:maint/maint-54from
hirorogo wants to merge 1 commit intounicode-org:maint/maint-54from
Conversation
Reset initOnce before clearing rootSingleton so that concurrent getRoot()/getRootCacheEntry() callers block on re-initialization instead of dereferencing a null or freed rootSingleton pointer. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Author
|
Could a maintainer please transition the Jira ticket ICU-23352 from New to Accepted? The |
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
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.
Summary
uprv_collation_root_cleanup()incollationroot.cppcallsSharedObject::clearPtr(rootSingleton)beforeinitOnce.reset(). A concurrentgetRoot()call can pass throughumtx_initOnce()(seeing initOnce as already complete) and then dereferencerootSingleton->tailoringafter it has been set to NULL or freed.Fix: Reset
initOncebefore clearingrootSingletonso concurrent callers block on re-initialization instead of accessing a dangling pointer.PoC
Test plan