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 9aa4c45f21b1 from chromium #37650

Merged
merged 6 commits into from
Mar 27, 2023

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Mar 22, 2023

[M108-LTS] Shutdown RtpContributingSourceCache in Dispose().

The cache is an off-heap object, but it is owned by an on-heap object
(RTCPeerConnection). Dispoing the owning object poisons memory owned by
it, but the cache may have in-flight tasks (cache doing ClearCache in a
delayed microtask). This CL adds a Shutdown() method to ensure the
cache isn't doing anything in the next microtask after disposal.

No reliable way to repro this has been found but the change should be
safe so hoping we can land without tests.

(cherry picked from commit 4d450ecd6ec7776c7505dcf7d2f04157ff3ba0eb)

Bug: 1413628
Change-Id: I479aace9859f4c10cd75d4aa5a34808b4726299d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4247023
Commit-Queue: Henrik Boström hbos@chromium.org
Cr-Original-Commit-Position: refs/heads/main@{#1105653}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4291513
Reviewed-by: Achuith Bhandarkar achuith@chromium.org
Owners-Override: Achuith Bhandarkar achuith@chromium.org
Reviewed-by: Henrik Boström hbos@chromium.org
Commit-Queue: Zakhar Voit voit@google.com
Cr-Commit-Position: refs/branch-heads/5359@{#1404}
Cr-Branched-From: 27d3765d341b09369006d030f83f582a29eb57ae-refs/heads/main@{#1058933}

Ref electron/security#293

Notes: Security: backported fix for CVE-2023-1218.

@ppontes ppontes requested a review from a team as a code owner March 22, 2023 16:32
@ppontes ppontes added security 🔒 semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 22-x-y labels Mar 22, 2023
@electron-cation electron-cation bot added new-pr 🌱 PR opened in the last 24 hours and removed new-pr 🌱 PR opened in the last 24 hours labels Mar 22, 2023
@jkleinsc jkleinsc merged commit 565c4fe into 22-x-y Mar 27, 2023
@jkleinsc jkleinsc deleted the cherry-pick/22-x-y/chromium/9aa4c45f21b1 branch March 27, 2023 17:50
@release-clerk
Copy link

release-clerk bot commented Mar 27, 2023

Release Notes Persisted

Security: backported fix for CVE-2023-1218.

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

2 participants