Cherry pick PR #11413: Load SSL root certificates to memory at app start#11539
Open
cobalt-github-releaser-bot wants to merge 1 commit into
Open
Cherry pick PR #11413: Load SSL root certificates to memory at app start#11539cobalt-github-releaser-bot wants to merge 1 commit into
cobalt-github-releaser-bot wants to merge 1 commit into
Conversation
Collaborator
Author
|
Caution There were merge conflicts while cherry picking! Check out cherry-pick-25.lts.1+-11413 and fix the conflicts before proceeding. Check the log at https://github.com/youtube/cobalt/actions/runs/30115628314 for details. |
Contributor
🤖 Gemini Suggested Commit Message💡 Pro Tips for a Better Commit Message:
|
yuying-y
force-pushed
the
cherry-pick-25.lts.1+-11413
branch
2 times, most recently
from
July 24, 2026 20:39
c4460af to
c87bafa
Compare
yuying-y
marked this pull request as ready for review
July 24, 2026 21:17
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors TrustStoreInMemoryStarboard to eagerly load all trusted root certificates from disk at startup rather than loading them lazily on demand. This simplifies the class by removing the need for thread synchronization (load_mutex_) and custom hash-based certificate lookup logic. The review feedback suggests optimizing the certificate loading process by caching the certificate directory path instead of repeatedly calling GetCertificateDirPath() inside the loop.
yuying-y
force-pushed
the
cherry-pick-25.lts.1+-11413
branch
from
July 24, 2026 21:18
c87bafa to
7e1dda9
Compare
This pull request loads the SSL root certificates at startup directly into the bssl trust store. It also safely guards TryLoadCert against triggering NOTREACHED() if a certificate file fails to load at runtime. This is a new issue with C26/C27 because we switched to 2-slot, one system image, and one installation slot. When the app is updated from system image and runs the package from the installation slot, right before it downloads an update, it'll wipe the installation slot including its own certs, which caused the issue. But before C26, there're 3 slots in total, and the updater doesn't wipe its own slot. On the other hand, the core content (cobalt_shell.pak) and UI fonts (SkFileMemoryChunkStream) are safe from this wipe because they use base::MemoryMappedFile and hold a persistent FILE* handle, which the OS honors natively. Issue: 535681824, 533843031 (cherry picked from commit f5d2add)
yuying-y
force-pushed
the
cherry-pick-25.lts.1+-11413
branch
from
July 24, 2026 23:39
7e1dda9 to
aed49bd
Compare
yuying-y
changed the title
yuying-y
enabled auto-merge (squash)
July 24, 2026 23:48
yuying-y
approved these changes
Jul 24, 2026
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.
Refer to the original PR: #11413
This pull request loads the SSL root certificates at startup directly into the bssl trust store. It also safely guards TryLoadCert against triggering NOTREACHED() if a certificate file fails to load at runtime.
This fixes a security vulnerability of forged cert with matching subject.
Issue: 533843031