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 06c87f9f42ff from chromium #36207

Merged
merged 2 commits into from Nov 2, 2022

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Nov 1, 2022

Avoid layout roots in subtrees skipped for style recalc

Layout roots are laid out from inner to outer in LocalFrameView. DOM
mutations may have added layout roots inside size container subtrees
before style recalc. If we decide to postpone style recalc until layout
of the size container, it means we may try to layout a root inside a
subtree skipped for style recalc. That causes a DCHECK and possibly
other issues.

This also fixes the use-after-poison issue 1365330.

(cherry picked from commit 0f0f1e99201fadb3c68518350e1cd6af1b665346)

Bug: 1371820, 1365330
Change-Id: Ia48890c08aacfe7b9a3e660817702abce0570564
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3934847
Reviewed-by: Ian Kilpatrick ikilpatrick@chromium.org
Commit-Queue: Rune Lillesveen futhark@chromium.org
Cr-Original-Commit-Position: refs/heads/main@{#1055853}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3953455
Auto-Submit: Rune Lillesveen futhark@chromium.org
Commit-Queue: Anders Hartvoll Ruud andruud@chromium.org
Reviewed-by: Anders Hartvoll Ruud andruud@chromium.org
Cr-Commit-Position: refs/branch-heads/5249@{#836}
Cr-Branched-From: 4f7bea5de862aaa52e6bde5920755a9ef9db120b-refs/heads/main@{#1036826}

Ref electron/security#236

Notes: Security: backported fix for CVE-2022-3654.

@ppontes ppontes requested review from a team as code owners November 1, 2022 21:04
@ppontes ppontes added 19-x-y backport-check-skip Skip trop's backport validity checking security 🔒 semver/patch backwards-compatible bug fixes labels Nov 1, 2022
@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 Nov 1, 2022
@ppontes ppontes force-pushed the cherry-pick/19-x-y/chromium/06c87f9f42ff branch from 3b35038 to e8c6c7e Compare November 1, 2022 21:35
@ppontes ppontes force-pushed the cherry-pick/19-x-y/chromium/06c87f9f42ff branch from e8c6c7e to 5d676d3 Compare November 2, 2022 09:02
@jkleinsc jkleinsc merged commit 9e58c1b into 19-x-y Nov 2, 2022
@jkleinsc jkleinsc deleted the cherry-pick/19-x-y/chromium/06c87f9f42ff branch November 2, 2022 18:18
@release-clerk
Copy link

release-clerk bot commented Nov 2, 2022

Release Notes Persisted

Security: backported fix for CVE-2022-3654.

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