chore: cherry-pick 3 changes from 0-M133 #45706
Open
Conversation
This file contains 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
ppontes
added
security 🔒
semver/patch
* 51cd241b7b13 from chromium * 1c7ff4d5477f from v8 * 8834c16acfcc from v8
ppontes
force-pushed
the
cherry-pick/security/32-x-y/0-m133
branch
from
474b1f0 to
f61afe8
Compare
ckerr
requested changes
Feb 19, 2025
There was a problem hiding this comment.
chromium/cherry-pick-51cd241b7b13.patch doesn't apply cleanly in this branch:
Applying: Make AcceptLanguagesWatcher a weak persistent object
Applying: Remove PersistentMemoryAllocator::GetAllocSize()
Applying: Reland "lzma_sdk: Update to 24.09."
.git/rebase-apply/patch:664: trailing whitespace.
.git/rebase-apply/patch:822: trailing whitespace.
.git/rebase-apply/patch:838: trailing whitespace.
.git/rebase-apply/patch:1209: trailing whitespace.
.git/rebase-apply/patch:4175: trailing whitespace.
error: patch failed: third_party/lzma_sdk/Asm/arm64/7zAsm.S:1
error: third_party/lzma_sdk/Asm/arm64/7zAsm.S: patch does not apply
error: patch failed: third_party/lzma_sdk/Asm/x86/7zAsm.asm:1
error: third_party/lzma_sdk/Asm/x86/7zAsm.asm: patch does not apply
error: patch failed: third_party/lzma_sdk/Asm/x86/7zCrcOpt.asm:1
error: third_party/lzma_sdk/Asm/x86/7zCrcOpt.asm: patch does not apply
error: patch failed: third_party/lzma_sdk/Asm/x86/LzmaDecOpt.asm:1
error: third_party/lzma_sdk/Asm/x86/LzmaDecOpt.asm: patch does not apply
error: patch failed: third_party/lzma_sdk/Asm/x86/Sha256Opt.asm:1
error: third_party/lzma_sdk/Asm/x86/Sha256Opt.asm: patch does not apply
error: patch failed: third_party/lzma_sdk/Asm/x86/XzCrc64Opt.asm:1
error: third_party/lzma_sdk/Asm/x86/XzCrc64Opt.asm: patch does not apply
error: patch failed: third_party/lzma_sdk/C/7zVersion.rc:1
error: third_party/lzma_sdk/C/7zVersion.rc: patch does not apply
Patch failed at 0149 Reland "lzma_sdk: Update to 24.09."
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
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.
electron/security#656 - 51cd241b7b13 from chromium
Reland "lzma_sdk: Update to 24.09."This is a reland of commit 1d69891ae775c74724558585929c89438a6fda93
Original change's description:
(cherry picked from commit 968d9282d215058bc19a7c0cf22f2dcdea153740)
Bug: 383772517, 388538957
Change-Id: I3f36e233d52c0ba560a5d740111d1db62a32b8fc
Low-Coverage-Reason: OTHER - It's not clear how to exercise some of these conditionally-compiled alternatives.
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6163689
Commit-Queue: Joshua Pawlicki [email protected]
Reviewed-by: Greg Thompson [email protected]
Cr-Original-Commit-Position: refs/heads/main@{#1404814}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6175641
Auto-Submit: Joshua Pawlicki [email protected]
Cr-Commit-Position: refs/branch-heads/6943@{#392}
Cr-Branched-From: 72dd0b377c099e1e0230cc7345d5a5125b46ae7d-refs/heads/main@{#1402768}
electron/security#655 - 1c7ff4d5477f from v8
Merged: [turbofan] LoadField's type with recorded FieldType depends on stabilityBug: 390465670
(cherry picked from commit f920b6b2c2b1132cd1fbe1198500ceeaedcaa146)
Change-Id: I0b430909275e583e5c0ecf2840e143fef461cbad
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6218882
Reviewed-by: Darius Mercadier [email protected]
Commit-Queue: Darius Mercadier [email protected]
Auto-Submit: Olivier Flückiger [email protected]
Commit-Queue: Olivier Flückiger [email protected]
Cr-Commit-Position: refs/branch-heads/13.2@{#72}
Cr-Branched-From: 24068c59cedad9ee976ddc05431f5f497b1ebd71-refs/heads/13.2.152@{#1}
Cr-Branched-From: 6054ba94db0969220be4f94dc1677fc4696bdc4f-refs/heads/main@{#97085}
electron/security#653 - 8834c16acfcc from v8
Merged: [runtime] Fix write barrier check in FastCloneJSObjectAdd missing check for page being marked.
Fixed: 392521083
(cherry picked from commit ce071a295e54b32bf7f03373da943678231cb1ee)
Change-Id: Iccfc1617862a6010ab34389aa4931f45e7389c05
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6221320
Auto-Submit: Olivier Flückiger [email protected]
Commit-Queue: Igor Sheludko [email protected]
Commit-Queue: Olivier Flückiger [email protected]
Reviewed-by: Igor Sheludko [email protected]
Cr-Commit-Position: refs/branch-heads/13.2@{#74}
Cr-Branched-From: 24068c59cedad9ee976ddc05431f5f497b1ebd71-refs/heads/13.2.152@{#1}
Cr-Branched-From: 6054ba94db0969220be4f94dc1677fc4696bdc4f-refs/heads/main@{#97085}
Notes: