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

Jump to bottom

fix: Prevent glDeleteQueries from deleting a live Query #18566

Merged
merged 1 commit into from Jun 4, 2019
Merged

fix: Prevent glDeleteQueries from deleting a live Query #18566

merged 1 commit into from Jun 4, 2019

Conversation

miniak
Copy link
Contributor

@miniak miniak commented Jun 1, 2019 •
edited

Description of Change

Backport fix for https://bugs.chromium.org/p/chromium/issues/detail?id=904714
https://swiftshader.googlesource.com/SwiftShader.git/+/3fc6893c8b24c0490ce90dc427b781732a98ff38

Prevent glDeleteQueries from deleting a live Query

glDeleteQueries() instantly deletes all the es2::Query objects
passed as arguments to this function. If some of these queries
are still being used by the renderer, this will result in a use
after free error. To solve this issue, sw::Query is now a also
ref counted object.

/cc @electron/wg-security

Checklist

Release Notes

Notes: Backported fix for https://bugs.chromium.org/p/chromium/issues/detail?id=904714.

@miniak miniak added the 4-2-x label Jun 1, 2019
@miniak miniak requested a review from a team June 1, 2019 22:00
@miniak miniak self-assigned this Jun 1, 2019
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Jun 1, 2019
@miniak miniak changed the title fix: Prevent glDeleteQueries from deleting a live Query fix: Issue 904714: heap-use-after-free on sw::Renderer::finishRendering Jun 1, 2019
@miniak miniak changed the title fix: Issue 904714: heap-use-after-free on sw::Renderer::finishRendering fix: Prevent glDeleteQueries from deleting a live Query Jun 1, 2019
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Jun 2, 2019
@miniak miniak added the backport This is a backport PR label Jun 3, 2019
@zcbenz zcbenz merged commit bbeedaf into 4-2-x Jun 4, 2019
@release-clerk
Copy link

release-clerk bot commented Jun 4, 2019

Release Notes Persisted

Backported fix https://bugs.chromium.org/p/chromium/issues/detail?id=904714.

@zcbenz zcbenz deleted the miniak/backport-904714-4-2-x branch June 4, 2019 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nornagon nornagon nornagon approved these changes

@zcbenz zcbenz zcbenz approved these changes

Assignees

@miniak miniak

Labels
4-2-x backport This is a backport PR security 🔒
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@miniak @nornagon @zcbenz