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 8 changes from Release-3-M120 #40901

Merged
merged 3 commits into from Jan 8, 2024

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Jan 6, 2024

electron/security#446 - 5b2fddadaa12 from chromium Clamp the input value correctly before scheduling an AudioParam event

When the AudioParam value is set via the setter, it internally calls
the setValueAtTime() function to schedule the change. However, the
current code does not correctly clamp the value within the nominal
range. This CL fixes the problem.

(cherry picked from commit c97b506c1e32951dd39e11e453e1ecc29cc0b35c)

Bug: 1505086
Test: Locally confirmed with both negative and positive param values.
Change-Id: Ibb0aae168161af9ea95c5e11a929b3aa2c621c73
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5100625
Reviewed-by: Michael Wilson mjwilson@chromium.org
Commit-Queue: Hongchan Choi hongchan@chromium.org
Cr-Original-Commit-Position: refs/heads/main@{#1235028}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5112838
Commit-Queue: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Bot-Commit: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Auto-Submit: Hongchan Choi hongchan@chromium.org
Cr-Commit-Position: refs/branch-heads/6099@{#1497}
Cr-Branched-From: e6ee4500f7d6549a9ac1354f8d056da49ef406be-refs/heads/main@{#1217362}

electron/security#444 - cd9486849ba3 from sqlite Fix a spurious "misuse of aggregate function" error that could occur when an aggregate function was used within the FROM clause of a sub-select of the select that owns the aggregate. e.g. "SELECT (SELECT x FROM (SELECT sum(t1.a) AS x)) FROM t1". [forum:/forumpost/c9970a37ed | Forum post c9970a37ed].

FossilOrigin-Name: 4470f657d2069972d02a00983252dec1f814d90c0d8d0906e320e955111e8c11
(cherry picked from commit 5e4233a9e48b124d4d342b757b34e4ae849f5cf8)

Bug: 1511689
Change-Id: I69263fc0a5fa66df5c09b964864568f2fc7a6ca5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/deps/sqlite/+/5123910
Auto-Submit: Evan Stade estade@chromium.org
Commit-Queue: Ayu Ishii ayui@chromium.org
Reviewed-by: Ayu Ishii ayui@chromium.org

electron/security#445 - 50a1bddfca85 from chromium Use cross thread handles to bind args for async webgpu context creation

(cherry picked from commit 542b278a0c1de7202f4bf5e3e5cbdc2dd6c337d4)

Fixed: 1506923
Change-Id: I174703cbd993471e3afb39c0cfa4cce2770755f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5113019
Reviewed-by: Corentin Wallez cwallez@chromium.org
Commit-Queue: Austin Eng enga@chromium.org
Reviewed-by: Stephen White senorblanco@chromium.org
Cr-Original-Commit-Position: refs/heads/main@{#1237179}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5133239
Cr-Commit-Position: refs/branch-heads/6099@{#1551}
Cr-Branched-From: e6ee4500f7d6549a9ac1354f8d056da49ef406be-refs/heads/main@{#1217362}

electron/security#447 - 0c1d249c3fe2 from angle M120: Translator: Optimize field-name-collision check

As each field of the struct was encountered, its name was linearly
checked against previously added fields. That's O(n^2).

The name collision check is now moved to when the struct is completely
defined, and is done with an unordered_map.

Bug: chromium:1505009
Change-Id: I3fbc23493e5a03e61b631af615cffaf9995fd566
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5143826
Reviewed-by: Cody Northrop cnorthrop@google.com

electron/security#448 - 01f439363dcb from angle M120: Vulkan: Don't crash when glCopyTexImage2D redefines itself

The Vulkan backend marks a level being redefined as such before doing
the copy. If a single-level texture was being redefined, it releases it
so it can be immediately reallocated. If the source of the copy is the
same texture, this causes a crash.

This can be properly supported by using a temp image to do the copy, but
that is not implemented in this change.

Bug: chromium:1501798
Change-Id: I3a902b1e9eec41afd385d9c75a8c95dc986070a8
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5143829
Reviewed-by: Cody Northrop cnorthrop@google.com

Notes:

@ppontes ppontes requested a review from a team as a code owner January 6, 2024 23:30
@ppontes ppontes added security 🔒 semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 26-x-y labels Jan 6, 2024
@ppontes ppontes marked this pull request as draft January 6, 2024 23:30
@ppontes ppontes force-pushed the cherry-pick/security/26-x-y/release-3-m120 branch from f2734bb to c9416d4 Compare January 8, 2024 09:17
@ppontes ppontes changed the title chore: cherry-pick 5 changes from Release-3-M120 chore: cherry-pick 9 changes from Release-3-M120 Jan 8, 2024
* 5b2fddadaa12 from chromium
* cd9486849ba3 from sqlite
* 50a1bddfca85 from chromium
* 0c1d249c3fe2 from angle
* 01f439363dcb from angle
@ppontes ppontes force-pushed the cherry-pick/security/26-x-y/release-3-m120 branch from d6368a0 to e324b46 Compare January 8, 2024 13:17
@ppontes ppontes changed the title chore: cherry-pick 9 changes from Release-3-M120 chore: cherry-pick 8 changes from Release-3-M120 Jan 8, 2024
@ppontes ppontes force-pushed the cherry-pick/security/26-x-y/release-3-m120 branch from e324b46 to b431c6a Compare January 8, 2024 13:18
@ppontes ppontes marked this pull request as ready for review January 8, 2024 14:57
@jkleinsc jkleinsc merged commit 6cdb2fb into 26-x-y Jan 8, 2024
13 checks passed
@jkleinsc jkleinsc deleted the cherry-pick/security/26-x-y/release-3-m120 branch January 8, 2024 20:58
Copy link

release-clerk bot commented Jan 8, 2024

Release Notes Persisted

  • Security: backported fix for CVE-2024-0224.
  • Security: backported fix for 1511689.
  • Security: backported fix for CVE-2024-0225.
  • Security: backported fix for CVE-2024-0223.
  • Security: backported fix for CVE-2024-0222.
  • Security: backported fix for 1509576.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
26-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.

None yet

3 participants