Skip to content

chore: cherry-pick 38ab9c5b06a4 from chromium#33885

Merged
jkleinsc merged 2 commits into16-x-yfrom
cherry-pick/16-x-y/chromium/38ab9c5b06a4
Apr 28, 2022
Merged

chore: cherry-pick 38ab9c5b06a4 from chromium#33885
jkleinsc merged 2 commits into16-x-yfrom
cherry-pick/16-x-y/chromium/38ab9c5b06a4

Conversation

@ppontes
Copy link
Copy Markdown
Member

@ppontes ppontes commented Apr 21, 2022

[M96-LTS] Use IsErrorDocument() to prevent BFCacheing of interstitials and errors.

M96 merge issues:
Tests not present on M96:

  • back_forward_cache_basics_browsertest.cc
  • back_forward_cache_browsertest.h
  • back_forward_cache_internal_browsertest.cc
    chrome_track_event.proto:
  • changed code (tracing) doesn't exist on M96, discarded
    all changes
    back_forward_cache_browsertest.cc:
  • conflicting includes
  • removed NavigateAndBlock, which would be called on
    on back_forward_cache_browsertest.cc (not present in M96)
    page_handler.cc:
  • conflicting case statements on NotRestoredReasonToProtocol
    back_forward_cache_can_store_document_result.cc:
  • NotRestoredReasonToTraceEnum not present on M96
  • conflicting case statements on NotRestoredReasonToString
    back_forward_cache_metrics.h:
  • conflicting entries for NotRestoredReason enum

In the bug, a crash occurs because we try to cache an interstitial. We
catch some error documents via status codes etc but interstitials do
not consistently set those. Checking IsErrorDocument() is more reliable.

(cherry picked from commit 7a05b426c6c51254a08de9a8dee8db9c1911b9c9)

Bug: 1274308,1287996,1283050
Change-Id: Ifec662c169c77e33ca5dc4d56b0e42c8d71f1d97
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3319862
Commit-Queue: Fergal Daly [email protected]
Cr-Original-Commit-Position: refs/heads/main@{#981026}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3577265
Reviewed-by: Fergal Daly [email protected]
Reviewed-by: Artem Sumaneev [email protected]
Owners-Override: Artem Sumaneev [email protected]
Commit-Queue: Roger Felipe Zanoni da Silva [email protected]
Cr-Commit-Position: refs/branch-heads/4664@{#1592}
Cr-Branched-From: 24dc4ee75e01a29d390d43c9c264372a169273a7-refs/heads/main@{#929512}

Notes: Backported fix for CVE-2022-1308.

@ppontes ppontes requested review from a team as code owners April 21, 2022 13:57
@ppontes ppontes added 16-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes labels Apr 21, 2022
@electron-cation electron-cation Bot added new-pr 🌱 PR opened recently and removed new-pr 🌱 PR opened recently labels Apr 21, 2022
@jkleinsc jkleinsc merged commit 916acaa into 16-x-y Apr 28, 2022
@jkleinsc jkleinsc deleted the cherry-pick/16-x-y/chromium/38ab9c5b06a4 branch April 28, 2022 15:23
@release-clerk
Copy link
Copy Markdown

release-clerk Bot commented Apr 28, 2022

Release Notes Persisted

Backported fix for CVE-2022-1308.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

16-x-y backport-check-skip Skip trop's backport validity checking security 🔒 semver/patch backwards-compatible bug fixes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants