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 70579363ce7b from chromium #25025

Merged
merged 2 commits into from Aug 20, 2020

Conversation

nornagon
Copy link
Member

@nornagon nornagon commented Aug 18, 2020

usb: Prevent iterator invalidation during Promise resolution

This change swaps sets of ScriptPromiseResolvers into local variables in
a number of places where it was possible for script to execute during
the call to Resolve() or Reject() and modify the set being iterated
over, thus invalidating the iterator.

(cherry picked from commit dbc6c3c3652680e287c60b3c6551622748543439)

Bug: 1106773
Change-Id: Id4eb0cd444a7dbb5de23038ec80f44fee649cfe4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2304538
Auto-Submit: Reilly Grant reillyg@chromium.org
Commit-Queue: James Hollyer jameshollyer@chromium.org
Reviewed-by: James Hollyer jameshollyer@chromium.org
Cr-Original-Commit-Position: refs/heads/master@{#790217}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2310964
Reviewed-by: Reilly Grant reillyg@chromium.org
Commit-Queue: Reilly Grant reillyg@chromium.org
Cr-Commit-Position: refs/branch-heads/4183@{#842}
Cr-Branched-From: 740e9e8a40505392ba5c8e022a8024b3d018ca65-refs/heads/master@{#782793}

Notes: Security: Backported fix for CVE-2020-6541.

@nornagon nornagon requested a review from a team as a code owner Aug 18, 2020
@nornagon nornagon added 8-x-y backport-check-skip Skip trop's backport validity checking labels Aug 18, 2020
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Aug 18, 2020
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Aug 19, 2020
@codebytere codebytere merged commit 08aa452 into 8-x-y Aug 20, 2020
16 checks passed
@release-clerk
Copy link

release-clerk bot commented Aug 20, 2020

Release Notes Persisted

Security: Backported fix for CVE-2020-6541.

@codebytere codebytere deleted the cherry-pick/8-x-y/chromium/70579363ce7b branch Aug 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8-x-y backport-check-skip Skip trop's backport validity checking
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants