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: [FileSystem] Harden against overflows of OperationID a bit better #18572

Merged
merged 3 commits into from Jun 4, 2019
Merged

fix: [FileSystem] Harden against overflows of OperationID a bit better #18572

merged 3 commits into from Jun 4, 2019

Conversation

miniak
Copy link
Contributor

@miniak miniak commented Jun 2, 2019

Description of Change

Backport fix for https://bugs.chromium.org/p/chromium/issues/detail?id=925864
https://chromium.googlesource.com/chromium/src.git/+/b38064dbb21aaf32151073dcb7d594b240c68f73

[FileSystem] Harden against overflows of OperationID a bit better.

Rather than having a UAF when OperationID overflows instead overwrite
the old operation with the new one. Can still cause weirdness, but at
least won't result in UAF. Also update OperationID to uint64_t to
make sure we don't overflow to begin with.

/cc @electron/wg-security

Checklist

Release Notes

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

@miniak miniak requested a review from a team June 2, 2019 11:43
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Jun 2, 2019
@miniak miniak self-assigned this Jun 2, 2019
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Jun 3, 2019
@miniak miniak added the backport This is a backport PR label Jun 3, 2019
@alexeykuzmin
Copy link
Contributor

@miniak Can you please fix conflicts?

@miniak
Copy link
Contributor Author

miniak commented Jun 4, 2019

@alexeykuzmin done

@codebytere codebytere merged commit a6f9b6f into 4-2-x Jun 4, 2019
@release-clerk
Copy link

release-clerk bot commented Jun 4, 2019

Release Notes Persisted

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

@codebytere codebytere deleted the miniak/backport-925864-4-2-x branch June 4, 2019 16:23
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

@deepak1556 deepak1556 deepak1556 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
6 participants
@miniak @alexeykuzmin @nornagon @zcbenz @deepak1556 @codebytere