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 ed5f62c36d from angle. #28872

Merged
merged 1 commit into from Apr 28, 2021

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Apr 27, 2021

D3D11: Skip blits if there is no intersection of dest areas

Blit11 would clip the destination rectangle with the destination size
but ignore the result. gl::ClipRectangle returns false when the
rectangles do not intersect at all, indicating the blit can be skipped.

This could lead to an out-of-bounds write to the GPU memory for the
destination texture.

Mark ClipRectangle as nodiscard to prevent future issues.

Bug: chromium:1199402
Change-Id: I260e82d0917b8aa7e7887f2c9f7ed4b1a03ba785
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2836786
Reviewed-by: Jamie Madill jmadill@chromium.org
Commit-Queue: Geoff Lang geofflang@chromium.org
(cherry picked from commit b574643ef28c92fcea5122dd7a72acb42a514eed)
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2846982
Reviewed-by: Geoff Lang geofflang@chromium.org

Notes: Security: backported fix to CVE-2021-21233.

@ppontes ppontes added semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 12-x-y labels Apr 27, 2021
@ppontes ppontes requested a review from a team as a code owner April 27, 2021 19:39
@ppontes ppontes force-pushed the cherry-pick/12-x-y/angle/ed5f62c36d branch from 82626a6 to 716f1d2 Compare April 27, 2021 23:12
@MarshallOfSound MarshallOfSound merged commit 57a5a31 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 CVE-2021-21233.

@MarshallOfSound MarshallOfSound deleted the cherry-pick/12-x-y/angle/ed5f62c36d 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

3 participants