Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions patches/build-hardening.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 5898b8c54bef2..d924cec372c1a 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -371,6 +371,10 @@ config("compiler") {
}
}

+ if (is_linux) {
+ cflags += [ "-fstack-clash-protection" ]
+ }
+
if (use_lld) {
ldflags += [ "-fuse-ld=lld" ]
if (lld_path != "") {
@@ -2059,7 +2063,7 @@ config("chromium_code") {
# Non-chromium code is not guaranteed to compile cleanly with
# _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
# disabled, so only do that for Release build.
- fortify_level = "2"
+ fortify_level = "3"

# ChromeOS's toolchain supports a high-quality _FORTIFY_SOURCE=3
# implementation with a few custom glibc patches. Use that if it's
34 changes: 34 additions & 0 deletions patches/clear-windowname-property-across-contexts.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
index a0ac946fc64b4..bb3ba83bf77a9 100644
--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
@@ -192,7 +192,7 @@ BASE_FEATURE(kCdmStorageDatabaseMigration,
// swap BrowsingContextGroups(BrowsingInstances).
BASE_FEATURE(kClearCrossSiteCrossBrowsingContextGroupWindowName,
"ClearCrossSiteCrossBrowsingContextGroupWindowName",
- base::FEATURE_DISABLED_BY_DEFAULT);
+ base::FEATURE_ENABLED_BY_DEFAULT);

BASE_FEATURE(kCompositeBGColorAnimation,
"CompositeBGColorAnimation",
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
index 85c4d912e2fdb..d03099ab283f0 100644
--- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -2854,7 +2854,7 @@ void DocumentLoader::CommitNavigation() {
// that the name would be nulled and if the name is accessed after we will
// fire a UseCounter. If we decide to move forward with this change, we'd
// actually clean the name here.
- // frame_->tree().setName(g_null_atom);
+ frame_->Tree().SetName(g_null_atom);
frame_->Tree().ExperimentalSetNulledName();
}

@@ -2865,6 +2865,7 @@ void DocumentLoader::CommitNavigation() {
// TODO(shuuran): CrossSiteCrossBrowsingContextGroupSetNulledName will just
// record the fact that the name would be nulled and if the name is accessed
// after we will fire a UseCounter.
+ frame_->Tree().SetName(g_null_atom);
frame_->Tree().CrossSiteCrossBrowsingContextGroupSetNulledName();
}

Empty file modified update-vanadium-patches.sh
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] Checkout PGO profiles
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 24e3d54243d59..5f30d7de632e9 100644
index 76ea649d79e24..8ce0c6fd25774 100644
--- a/DEPS
+++ b/DEPS
@@ -149,7 +149,7 @@ vars = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 5f30d7de632e9..4505e1a6164b9 100644
index 8ce0c6fd25774..10f8c4dea1d90 100644
--- a/DEPS
+++ b/DEPS
@@ -118,7 +118,7 @@ vars = {
Expand Down