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 c768895b3f, 58393127e7 and c2f6803bdd from chromium #28821

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Apr 23, 2021

Add crashkeys to identify where |target| is assigned to a stale value

In RenderWidgetHostInputEventRouter::DispatchTouchscreenGestureEvent, the
|target|'s address is changed and assigned to a stale value.

(cherry picked from commit b7758233216445264174dd249e7565ab4849daa6)

Bug: 1155297
Change-Id: Id87175059b6d74eeac165abe0ccfd5f6c25d659a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2764892
Commit-Queue: Lan Wei lanwei@chromium.org
Reviewed-by: Alex Moshchuk alexmos@chromium.org
Reviewed-by: James MacLean wjmaclean@chromium.org
Cr-Original-Commit-Position: refs/heads/master@{#867419}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2828850
Auto-Submit: Lan Wei lanwei@chromium.org
Reviewed-by: Adrian Taylor adetaylor@google.com
Owners-Override: Lan Wei lanwei@chromium.org
Cr-Commit-Position: refs/branch-heads/4430@{#1292}
Cr-Branched-From: e5ce7dc4f7518237b3d9bb93cccca35d25216cbe-refs/heads/master@{#857950}

==========

Add weak pointer to RWHIER::FrameSinkIdOwnerMap and RWHIER::TargetMap

In RWHIER::FrameSinkIdOwnerMap and RWHIER::TargetMap, we change raw
pointer of RenderWidgetHostViewBase to weak pointer, such as
using FrameSinkIdOwnerMap = std::unordered_map<viz::FrameSinkId,
base::WeakPtr,
viz::FrameSinkIdHash>;
using TargetMap = std::map<uint32_t,
base::WeakPtr>;

This CL should fix the crash of stale pointer.

(cherry picked from commit 3e3e3cf7036d7e33a4d68b8416ae25730f9eee1d)

Bug: 1155297
Change-Id: I5b3270882ef06ae48c86bd460261723c7113953d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2792344
Reviewed-by: James MacLean wjmaclean@chromium.org
Reviewed-by: Aaron Colwell acolwell@chromium.org
Commit-Queue: Lan Wei lanwei@chromium.org
Cr-Original-Commit-Position: refs/heads/master@{#870013}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2828858
Auto-Submit: Lan Wei lanwei@chromium.org
Bot-Commit: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Owners-Override: Lan Wei lanwei@chromium.org
Cr-Commit-Position: refs/branch-heads/4430@{#1293}
Cr-Branched-From: e5ce7dc4f7518237b3d9bb93cccca35d25216cbe-refs/heads/master@{#857950}

==========

Add null pointer check in RenderWidgetHostInputEventRouter

We have some crashes in RenderWidgetHostInputEventRouter class, we are
adding some null pointer check in this class to avoid the crash.

(cherry picked from commit 5f47666b79ac7ded20e1c7657037498561bd3352)

Bug: 1155297
Change-Id: I3b63d5748523ae2ce8ab469832adfc75d586e411
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2818680
Reviewed-by: Charlie Reis creis@chromium.org
Commit-Queue: Lan Wei lanwei@chromium.org
Cr-Original-Commit-Position: refs/heads/master@{#871108}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2830091
Auto-Submit: Lan Wei lanwei@chromium.org
Bot-Commit: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Owners-Override: Lan Wei lanwei@chromium.org
Cr-Commit-Position: refs/branch-heads/4430@{#1296}
Cr-Branched-From: e5ce7dc4f7518237b3d9bb93cccca35d25216cbe-refs/heads/master@{#857950}

Notes: Security: backported fix to chromium:1155297.

@ppontes ppontes added semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 12-x-y labels Apr 23, 2021
@ppontes ppontes requested a review from a team as a code owner April 23, 2021 20:59
@ppontes ppontes force-pushed the cherry-pick/12-x-y/chromium/c768895b3f-n-58393127e7-n-c2f6803bdd branch from b66865d to 7df7d9f Compare April 27, 2021 10:56
@ppontes ppontes force-pushed the cherry-pick/12-x-y/chromium/c768895b3f-n-58393127e7-n-c2f6803bdd branch from a2c8085 to 11c5d76 Compare April 27, 2021 23:11
@MarshallOfSound MarshallOfSound merged commit cd093d2 into 12-x-y Apr 28, 2021
@release-clerk
Copy link

release-clerk bot commented Apr 28, 2021

Release Notes Persisted

Security: backported fix to chromium:1155297.

@MarshallOfSound MarshallOfSound deleted the cherry-pick/12-x-y/chromium/c768895b3f-n-58393127e7-n-c2f6803bdd branch April 28, 2021 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
12-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants