Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: cherry-pick 3 changes from 0-M133 #45705

Open
wants to merge 1 commit into
base: 33-x-y
Choose a base branch
from

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Feb 19, 2025

electron/security#656 - 51cd241b7b13 from chromium Reland "lzma_sdk: Update to 24.09."

This is a reland of commit 1d69891ae775c74724558585929c89438a6fda93

Original change's description:

lzma_sdk: Update to 24.09.

Files originate from https://7-zip.org/a/lzma2409.7z
SHA-256(./lzma2409.7z)=
79b39f10b7b69eea293caa90c3e7ea07faf8f01f8ae9db1bb1b90c092375e5f3

Fixed: 383772517, 40849176
Change-Id: I7ccefbcc0dc92f94ae43566fe9d8b962369ea8b8
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/+/6091038
Reviewed-by: Greg Thompson [email protected]
Commit-Queue: Will Harris [email protected]
Auto-Submit: Joshua Pawlicki [email protected]
Reviewed-by: Will Harris [email protected]
Cr-Commit-Position: refs/heads/main@{#1404227}

(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 stability

Bug: 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 FastCloneJSObject

Add 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:

  • Security: backported fix for 383772517.
  • Security: backported fix for 390465670.
  • Security: backported fix for CVE-2025-0445.

@ppontes ppontes requested a review from a team as a code owner February 19, 2025 17:32
@ppontes ppontes added security 🔒 semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 33-x-y labels Feb 19, 2025
@ppontes ppontes marked this pull request as draft February 19, 2025 17:35
@ppontes ppontes force-pushed the cherry-pick/security/33-x-y/0-m133 branch from a6e86d9 to 822f329 Compare February 19, 2025 17:58
@ppontes ppontes marked this pull request as ready for review February 19, 2025 17:58
@codebytere
Copy link
Member

@ppontes:

Patch file 'patches/chromium/cherry-pick-51cd241b7b13.patch' has trailing whitespace on some lines (701,859,875,1246,4212,4246,6141,6171,6553,6576,6642,6828,7022,7174,7250,7810,7888,7961,8224,8390,8635,9170,9201,9836,10578,11656,11746,14672,14673,14707,16278,16630,17395,17410,17414,17422).

@ppontes ppontes force-pushed the cherry-pick/security/33-x-y/0-m133 branch 3 times, most recently from a4fdec9 to ac0b3a5 Compare February 21, 2025 21:40
* 51cd241b7b13 from chromium
* 1c7ff4d5477f from v8
* 8834c16acfcc from v8
@ppontes ppontes force-pushed the cherry-pick/security/33-x-y/0-m133 branch from ac0b3a5 to 85653b9 Compare February 21, 2025 21:41
codebytere
codebytere previously approved these changes Feb 23, 2025
@@ -1,6 +1,5 @@
# `git apply` and friends don't understand CRLF, even on windows. Force those
# files to be checked out with LF endings even if core.autocrlf is true.
*.patch text eol=lf
Copy link
Member

@codebytere codebytere Feb 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't remove this imo - it is more likely to cause further issues in future patch changes.

@codebytere codebytere dismissed their stale review February 24, 2025 08:54

We should re-add the LF line change

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
33-x-y backport-check-skip Skip trop's backport validity checking security 🔒 semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants