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

Fix UAF with AdBlockFiltersProviderManager #18953

Merged
merged 1 commit into from
Jun 19, 2023

Conversation

antonok-edm
Copy link
Collaborator

Resolves https://github.com/brave/internal/issues/1041

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@mherrmann
Copy link
Collaborator

@antonok-edm I accidentally started (and then aborted) a windows-x86 build of your PR. Restarting it now so it's mergable again. Sorry for the trouble.

@@ -324,7 +324,10 @@ AdBlockService::AdBlockService(
resource_provider_.get(), GetTaskRunner());
}

AdBlockService::~AdBlockService() = default;
AdBlockService::~AdBlockService() {
AdBlockFiltersProviderManager::GetInstance()->RemoveProvider(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually, why the manager doesn't own providers? It would less error-prone this way. I'm approving just to fix the UAF, but i think we can utilize a better patter

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the short answer is "historical reasons", but @ShivanKaul will be handling this in #18876

@antonok-edm antonok-edm merged commit d23daed into master Jun 19, 2023
@antonok-edm antonok-edm deleted the uaf-exception-exception-list branch June 19, 2023 15:33
@github-actions github-actions bot added this to the 1.54.x - Nightly milestone Jun 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants