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 06851790480e from chromium #37483

Merged
merged 3 commits into from
Mar 6, 2023

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Mar 3, 2023

[search_engines] Exclude Policy and Play API engines from Sync merging

There's a security bug in which the call to ResetTemplateURLGUID can
cause a policy-created engine to be deleted. This means that after
the call, either the current conflicting_turl pointer, or future
iterations in the loop may point to an already-freed TemplateURL,
causing the use-after free bug.

This CL addresses that by forbidding Policy-created and Play API
engines from being merged into Synced engines.

Although Play API engines aren't directly affected, they seem to also
not be something that should be merged to Synced engines.

(cherry picked from commit 315632458eb795ef9d9dce3fd1062f9e6f2c2077)

Bug: 1414224
Change-Id: Ide43d71e9844e04a7ffe2e7ad2a522b6ca1535a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4250623
Reviewed-by: Matthew Denton mpdenton@chromium.org
Reviewed-by: Mikel Astiz mastiz@chromium.org
Commit-Queue: Tommy Li tommycli@chromium.org
Cr-Original-Commit-Position: refs/heads/main@{#1106249}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4274984
Reviewed-by: Tommy Li tommycli@chromium.org
Commit-Queue: Krishna Govind govind@chromium.org
Cr-Commit-Position: refs/branch-heads/5481@{#1238}
Cr-Branched-From: 130f3e4d850f4bc7387cfb8d08aa993d288a67a9-refs/heads/main@{#1084008}

Notes: Security: backported fix for 1414224.

@ppontes ppontes requested a review from a team as a code owner March 3, 2023 00:24
@ppontes ppontes added security 🔒 semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 22-x-y labels Mar 3, 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 3, 2023
@codebytere codebytere merged commit 8352346 into 22-x-y Mar 6, 2023
@codebytere codebytere deleted the cherry-pick/22-x-y/chromium/06851790480e branch March 6, 2023 15:47
@release-clerk
Copy link

release-clerk bot commented Mar 6, 2023

Release Notes Persisted

Security: backported fix for 1414224.

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