* [PR PATCH] chromium: update to 94.0.4606.54.
@ 2021-09-24 20:27 Duncaen
2021-09-25 15:44 ` [PR PATCH] [Updated] " Duncaen
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Duncaen @ 2021-09-24 20:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
There is a new pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-94
https://github.com/void-linux/void-packages/pull/33094
chromium: update to 94.0.4606.54.
- [ ] x86_64-glibc
- [ ] x86_64-musl
- [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/33094.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-94-33094.patch --]
[-- Type: text/x-diff, Size: 97591 bytes --]
From 87726be0b3b20cb4d76752e8d473d3c92332d57e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 24 Sep 2021 22:25:49 +0200
Subject: [PATCH] chromium: update to 94.0.4606.54.
---
.../files/musl-patches/no-mallinfo.patch | 13 +-
...e3dfcd0690df0e7b212fedcb95402f16935d.patch | 36 -
...14051210388bfcff605570d33f08cfa7bcaa.patch | 36 -
...c8b484c18c621d4b194635e41f171543f1df.patch | 42 -
...9ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch | 36 -
...5a1051551af26aaefc6fcd33502a51725396.patch | 36 -
srcpkgs/chromium/patches/9d080c0.patch | 196 +++
srcpkgs/chromium/patches/9d080c0.patch.args | 1 +
.../patches/chromium-90-ruy-include.patch | 24 -
.../patches/chromium-93-pdfium-include.patch | 117 --
.../chromium-94-CustomSpaces-include.patch | 24 +
.../patches/chromium-94-ffmpeg-roll.patch | 49 +
.../chromium-94-ffmpeg-roll.patch.args | 1 +
.../chromium/patches/chromium-webrtc-r0.patch | 33 -
.../linux-sandbox-fix-fstatat-crash.patch | 1384 -----------------
srcpkgs/chromium/patches/musl-stat.patch | 12 +
.../patches/remove-llvm13-warning-flags.patch | 12 +-
.../patches/use-ffile-compilation-dir.patch | 66 +
.../use-ffile-compilation-dir.patch.args | 1 +
.../patches/xxx-ppc64le-support.patch | 4 +-
srcpkgs/chromium/template | 38 +-
21 files changed, 396 insertions(+), 1765 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
delete mode 100644 srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
delete mode 100644 srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
delete mode 100644 srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
delete mode 100644 srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
create mode 100644 srcpkgs/chromium/patches/9d080c0.patch
create mode 100644 srcpkgs/chromium/patches/9d080c0.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-90-ruy-include.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-webrtc-r0.patch
delete mode 100644 srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
create mode 100644 srcpkgs/chromium/patches/musl-stat.patch
create mode 100644 srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
create mode 100644 srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 5fd3dc2b379c..2524cbb84ca9 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -53,12 +53,17 @@
result.max_rss_kb = res.ru_maxrss;
--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
+++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
-@@ -84,7 +84,7 @@
+@@ -86,11 +86,11 @@
}
-
+
size_t Process::GetMallocUsage() {
--#if defined(HAVE_MALLINFO)
-+#if defined(HAVE_MALLINFO) && defined(__GLIBC__)
+-#if defined(HAVE_MALLINFO2)
++#if defined(HAVE_MALLINFO2) && defined(__GLIBC__)
+ struct mallinfo2 mi;
+ mi = ::mallinfo2();
+ return mi.uordblks;
+-#elif defined(HAVE_MALLINFO)
++#elif defined(HAVE_MALLINFO) && defined(__GLIBC__)
struct mallinfo mi;
mi = ::mallinfo();
return mi.uordblks;
diff --git a/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch b/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
deleted file mode 100644
index c43da8dfd8ab..000000000000
--- a/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 17d0e3dfcd0690df0e7b212fedcb95402f16935d Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Fri, 23 Jul 2021 10:17:49 +0000
-Subject: [PATCH] IWYU: missing include for using std::vector in hash password
- manager.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build breakage:
-../../components/password_manager/core/browser/hash_password_manager.h:44:8: error: ‘vector’ in namespace ‘std’ does not name a template type
- 44 | std::vector<PasswordHashData> RetrieveAllPasswordHashes();
- | ^~~~~~
-
-Bug: 819294
-Change-Id: I8c8a4ec3972eedb87a312c5ec56adf4a21b1b2a2
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041046
-Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
-Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#904696}
----
- components/password_manager/core/browser/hash_password_manager.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/components/password_manager/core/browser/hash_password_manager.h b/components/password_manager/core/browser/hash_password_manager.h
-index c762c5a8c7713..85e656edcba11 100644
---- a/components/password_manager/core/browser/hash_password_manager.h
-+++ b/components/password_manager/core/browser/hash_password_manager.h
-@@ -6,6 +6,7 @@
- #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_HASH_PASSWORD_MANAGER_H_
-
- #include <string>
-+#include <vector>
-
- #include "base/callback.h"
- #include "base/callback_list.h"
diff --git a/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch b/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
deleted file mode 100644
index 8757eb5c36a9..000000000000
--- a/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2f5514051210388bfcff605570d33f08cfa7bcaa Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Wed, 21 Jul 2021 08:34:58 +0000
-Subject: [PATCH] IWYU: usage of unique_ptr requires including <memory> in
- bluetooth low energy scan filter.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build because of missing include:
-../../device/bluetooth/bluetooth_low_energy_scan_filter.h:57:15: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type
- 57 | static std::unique_ptr<BluetoothLowEnergyScanFilter> Create(
- | ^~~~~~~~~~
-
-Bug: 819294
-Change-Id: I347953a083f1bcdf744fd86e1a73954c6f86b32e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041155
-Reviewed-by: Reilly Grant <reillyg@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#903819}
----
- device/bluetooth/bluetooth_low_energy_scan_filter.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/device/bluetooth/bluetooth_low_energy_scan_filter.h b/device/bluetooth/bluetooth_low_energy_scan_filter.h
-index a0436c184a967..7ae606cca014e 100644
---- a/device/bluetooth/bluetooth_low_energy_scan_filter.h
-+++ b/device/bluetooth/bluetooth_low_energy_scan_filter.h
-@@ -7,6 +7,7 @@
-
- #include <stddef.h>
- #include <stdint.h>
-+#include <memory>
- #include <vector>
-
- #include "base/time/time.h"
diff --git a/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch b/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
deleted file mode 100644
index babfdb367660..000000000000
--- a/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 82e2c8b484c18c621d4b194635e41f171543f1df Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Tue, 27 Jul 2021 08:09:39 +0000
-Subject: [PATCH] IWYU: usage of std::strcpy requires including cstring, in
- extension dialog auto confirm.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build breakage with libstdc++:
- ../../extensions/browser/extension_dialog_auto_confirm.cc: In destructor ‘extensions::ScopedTestDialogAutoConfirm::~ScopedTestDialogAutoConfirm()’:
- ../../extensions/browser/extension_dialog_auto_confirm.cc:43:8: error: ‘strcpy’ is not a member of ‘std’
- 43 | std::strcpy(g_extension_dialog_justification, old_justification_.c_str());
- | ^~~~~~
- ../../extensions/browser/extension_dialog_auto_confirm.cc: In member function ‘void extensions::ScopedTestDialogAutoConfirm::set_justification(const string&)’:
- ../../extensions/browser/extension_dialog_auto_confirm.cc:66:8: error: ‘strcpy’ is not a member of ‘std’
- 66 | std::strcpy(g_extension_dialog_justification, justification.c_str());
- | ^~~~~~
-
-Bug: 957519
-Change-Id: I313c38f22cab599fb8f0e4a339e8143af5bda3ee
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041001
-Reviewed-by: David Bertoni <dbertoni@chromium.org>
-Reviewed-by: Ben Wells <benwells@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#905634}
----
- extensions/browser/extension_dialog_auto_confirm.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/extensions/browser/extension_dialog_auto_confirm.cc b/extensions/browser/extension_dialog_auto_confirm.cc
-index adb4ac3f92ec8..be8b161bc1658 100644
---- a/extensions/browser/extension_dialog_auto_confirm.cc
-+++ b/extensions/browser/extension_dialog_auto_confirm.cc
-@@ -4,6 +4,7 @@
-
- #include "extensions/browser/extension_dialog_auto_confirm.h"
-
-+#include <cstring>
- #include <utility>
-
- #include "base/check.h"
diff --git a/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch b/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
deleted file mode 100644
index e51f76a4b3c0..000000000000
--- a/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Wed, 21 Jul 2021 08:36:20 +0000
-Subject: [PATCH] IWYU: missing memory include for unique_ptr usage in
- class_property.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix GCC build breakage because of missing inclide:
-./../ui/base/class_property.h:120:58: error: ‘std::unique_ptr’ has not been declared
- 120 | T* SetProperty(const ClassProperty<T*>* property, std::unique_ptr<T> value);
- | ^~~~~~~~~~
-
-Bug: 819294
-Change-Id: I46b921876702b8d44674689bbb5acdc107db21e5
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041030
-Reviewed-by: Peter Boström <pbos@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#903820}
----
- ui/base/class_property.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ui/base/class_property.h b/ui/base/class_property.h
-index f7b2f559858b7..88b49386ae0ad 100644
---- a/ui/base/class_property.h
-+++ b/ui/base/class_property.h
-@@ -8,6 +8,7 @@
- #include <stdint.h>
-
- #include <map>
-+#include <memory>
- #include <set>
- #include <type_traits>
-
diff --git a/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch b/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
deleted file mode 100644
index bab64a814b2f..000000000000
--- a/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9c675a1051551af26aaefc6fcd33502a51725396 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Mon, 26 Jul 2021 17:14:51 +0000
-Subject: [PATCH] IWYU: missing include for std::vector usage in devtools
- embedded message dispatcher.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix GCC build breakage:
- ../../chrome/browser/devtools/devtools_embedder_message_dispatcher.h:116:36: error: ‘vector’ in namespace ‘std’ does not name a template type
- 116 | const std::vector<base::Value>& params) = 0;
- | ^~~~~~
-
-Bug: 819294
-Change-Id: I379bf14416c3bfd3c0cdac7bb2542b79781261ec
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041156
-Reviewed-by: Joe Mason <joenotcharles@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#905300}
----
- chrome/browser/devtools/devtools_embedder_message_dispatcher.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-index 12f8500b7811d..4007112f39410 100644
---- a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-+++ b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-@@ -8,6 +8,7 @@
- #include <map>
- #include <memory>
- #include <string>
-+#include <vector>
-
- #include "base/callback.h"
- #include "ui/gfx/geometry/insets.h"
diff --git a/srcpkgs/chromium/patches/9d080c0.patch b/srcpkgs/chromium/patches/9d080c0.patch
new file mode 100644
index 000000000000..885ab5a1b82a
--- /dev/null
+++ b/srcpkgs/chromium/patches/9d080c0.patch
@@ -0,0 +1,196 @@
+From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001
+From: Dylan Cutler <dylancutler@google.com>
+Date: Wed, 26 May 2021 16:39:52 +0000
+Subject: [PATCH] Reland "Replace 'blacklist' with 'ignorelist' in
+ ./tools/msan/."
+
+This is a reland of 3b6263f2eece1264b052dfdcbc03b851d5abfb48
+
+Relanding now that https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2897974 is merged
+
+Original change's description:
+> Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+>
+> Bug: 1097272, 1097268
+> Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+> Commit-Queue: Dylan Cutler <dylancutler@google.com>
+> Reviewed-by: Nico Weber <thakis@chromium.org>
+> Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+> Cr-Commit-Position: refs/heads/master@{#883035}
+
+Bug: 1097272
+Bug: 1097268
+Change-Id: I11a5bc8972680c95fb1dab95ed3b707ed76f4667
+Cq-Include-Trybots: luci.chromium.try:chromeos-amd64-generic-cfi-thin-lto-rel
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2911096
+Commit-Queue: Dylan Cutler <dylancutler@google.com>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#886773}
+---
+ build/config/sanitizers/BUILD.gn | 44 ++++++++++----------
+ build_overrides/build.gni | 14 +++----
+ tools/msan/{blacklist.txt => ignorelist.txt} | 0
+ 3 files changed, 29 insertions(+), 29 deletions(-)
+ rename tools/msan/{blacklist.txt => ignorelist.txt} (100%)
+
+diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn
+index aaaad023474d1..55b388a437439 100644
+--- a/build/config/sanitizers/BUILD.gn
++++ b/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+ if (is_asan) {
+ cflags += [ "-fsanitize=address" ]
+ if (is_win) {
+- if (!defined(asan_win_blacklist_path)) {
+- asan_win_blacklist_path =
++ if (!defined(asan_win_blocklist_path)) {
++ asan_win_blocklist_path =
+ rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+ }
+- cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
++ cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
+ }
+ }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+ cflags = []
+ if (is_cfi && current_toolchain == default_toolchain) {
+- if (!defined(cfi_blacklist_path)) {
+- cfi_blacklist_path =
++ if (!defined(cfi_ignorelist_path)) {
++ cfi_ignorelist_path =
+ rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+ }
+ cflags += [
+ "-fsanitize=cfi-vcall",
+- "-fsanitize-blacklist=$cfi_blacklist_path",
++ "-fsanitize-ignorelist=$cfi_ignorelist_path",
+ ]
+
+ if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+ if (is_msan) {
+ assert(is_linux || is_chromeos,
+ "msan only supported on linux x86_64/ChromeOS")
+- if (!defined(msan_blacklist_path)) {
+- msan_blacklist_path =
+- rebase_path("//tools/msan/blacklist.txt", root_build_dir)
++ if (!defined(msan_ignorelist_path)) {
++ msan_ignorelist_path =
++ rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=memory",
+ "-fsanitize-memory-track-origins=$msan_track_origins",
+- "-fsanitize-blacklist=$msan_blacklist_path",
++ "-fsanitize-ignorelist=$msan_ignorelist_path",
+ ]
+ }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+ if (is_tsan) {
+ assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+- if (!defined(tsan_blacklist_path)) {
+- tsan_blacklist_path =
++ if (!defined(tsan_ignorelist_path)) {
++ tsan_ignorelist_path =
+ rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=thread",
+- "-fsanitize-blacklist=$tsan_blacklist_path",
++ "-fsanitize-ignorelist=$tsan_ignorelist_path",
+ ]
+ }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+ cflags = []
+ if (is_ubsan) {
+- if (!defined(ubsan_blacklist_path)) {
+- ubsan_blacklist_path =
++ if (!defined(ubsan_ignorelist_path)) {
++ ubsan_ignorelist_path =
+ rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+ }
+ cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+ "-fsanitize=signed-integer-overflow",
+ "-fsanitize=unreachable",
+ "-fsanitize=vla-bound",
+- "-fsanitize-blacklist=$ubsan_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_ignorelist_path",
+ ]
+
+ # Chromecast ubsan builds fail to compile with these
+@@ -486,8 +486,8 @@ config("ubsan_no_recover") {
+
+ config("ubsan_security_flags") {
+ if (is_ubsan_security) {
+- if (!defined(ubsan_security_blacklist_path)) {
+- ubsan_security_blacklist_path =
++ if (!defined(ubsan_security_ignorelist_path)) {
++ ubsan_security_ignorelist_path =
+ rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+@@ -495,7 +495,7 @@ config("ubsan_security_flags") {
+ "-fsanitize=shift",
+ "-fsanitize=signed-integer-overflow",
+ "-fsanitize=vla-bound",
+- "-fsanitize-blacklist=$ubsan_security_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
+ ]
+ }
+ }
+@@ -508,13 +508,13 @@ config("ubsan_null_flags") {
+
+ config("ubsan_vptr_flags") {
+ if (is_ubsan_vptr) {
+- if (!defined(ubsan_vptr_blacklist_path)) {
+- ubsan_vptr_blacklist_path =
++ if (!defined(ubsan_vptr_ignorelist_path)) {
++ ubsan_vptr_ignorelist_path =
+ rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=vptr",
+- "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
+ ]
+ }
+ }
+diff --git a/build_overrides/build.gni b/build_overrides/build.gni
+index 82627b03653f1..f3e563ab701bf 100644
+--- a/build_overrides/build.gni
++++ b/build_overrides/build.gni
+@@ -42,15 +42,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_blacklist_path = "path/to/tsan/ignores.txt"
+-# msan_blacklist_path = "path/to/msan/blacklist.txt"
+-# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
+-# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
+-# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
+-# cfi_blacklist_path = "path/to/cfi/ignores.txt"
++# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
++# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
++# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
++# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
++# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
++# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
+
+ declare_args() {
+ # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
+diff --git a/tools/msan/blacklist.txt b/tools/msan/ignorelist.txt
+similarity index 100%
+rename from tools/msan/blacklist.txt
+rename to tools/msan/ignorelist.txt
diff --git a/srcpkgs/chromium/patches/9d080c0.patch.args b/srcpkgs/chromium/patches/9d080c0.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/9d080c0.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/chromium-90-ruy-include.patch b/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
deleted file mode 100644
index 81d5367807be..000000000000
--- a/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Thu, 4 Mar 2021 15:05:46 +0000
-Subject: [PATCH] IWYU: include limits for std::numeric_limits
-
----
- third_party/ruy/src/ruy/block_map.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/ruy/src/ruy/block_map.cc b/third_party/ruy/src/ruy/block_map.cc
-index 44e5039..a7a7559 100644
---- a/third_party/ruy/src/ruy/block_map.cc
-+++ b/third_party/ruy/src/ruy/block_map.cc
-@@ -17,6 +17,7 @@ limitations under the License.
-
- #include <algorithm>
- #include <cstdint>
-+#include <limits>
-
- #ifdef RUY_MAKEBLOCKMAP_DEBUG
- #include <cstdio>
---
-2.26.2
-
diff --git a/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch b/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
deleted file mode 100644
index 72f2abd3e7a6..000000000000
--- a/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 7a6289c5ace52cf88f0e19caa5f78b7c15d0e7a6 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.co.uk>
-Date: Wed, 21 Jul 2021 17:42:30 +0000
-Subject: [PATCH] fxcodec, fxge: fix missing includes with libstdc++
-
-These missing includes break the build with gcc/libstdc++, they were not
-a problem in practice with clang/libc++.
-
-Change-Id: I40013f97ba7ab06f32aa59f87b04aec06a19478c
-Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83210
-Commit-Queue: Lei Zhang <thestig@chromium.org>
-Reviewed-by: Lei Zhang <thestig@chromium.org>
----
-
-diff --git a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-index cea0679..036f250 100644
---- a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-+++ b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-@@ -7,6 +7,7 @@
- #include "core/fxcodec/jpeg/jpegmodule.h"
-
- #include <setjmp.h>
-+#include <string.h>
-
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-index c66985a..9c1122b 100644
---- a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-+++ b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxcodec/jpx/cjpx_decoder.h"
-
-+#include <string.h>
-+
- #include <algorithm>
- #include <limits>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-index 5369d52..d198852 100644
---- a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-+++ b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/cfx_cliprgn.h"
-
-+#include <string.h>
-+
- #include <utility>
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-index 6f9b420..0f1ffae 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_bitmapcomposer.h"
-
-+#include <string.h>
-+
- #include "core/fxge/cfx_cliprgn.h"
- #include "core/fxge/dib/cfx_dibitmap.h"
-
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-index f57c00e..45a0a18 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_bitmapstorer.h"
-
-+#include <string.h>
-+
- #include <utility>
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-index 4ec0ddb..a1de2fb 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_dibbase.h"
-
-+#include <string.h>
-+
- #include <algorithm>
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-index d7ccf6c..94e8acc 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-
-+#include <string.h>
-+
- #include <limits>
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-index e8362d7..c04c6dc 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_scanlinecompositor.h"
-
-+#include <string.h>
-+
- #include <algorithm>
-
- #include "core/fxge/dib/fx_dib.h"
diff --git a/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch b/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
new file mode 100644
index 000000000000..01757758c1e2
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
@@ -0,0 +1,24 @@
+From 4eeacdaa57b29a079fe09315eb22557c06aa522e Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 13 Aug 2021 12:57:42 +0000
+Subject: [PATCH] IWYU: add memory for std::unique_ptr in blink::CustomSpaces
+
+---
+ .../blink/renderer/platform/heap/v8_wrapper/custom_spaces.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
+index df0465a..640cb33 100644
+--- a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
++++ b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
+@@ -5,6 +5,7 @@
+ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
+ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
+
++#include <memory>
+ #include <vector>
+
+ #include "third_party/blink/renderer/platform/platform_export.h"
+--
+2.31.1
+
diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
new file mode 100644
index 000000000000..68f26364eda7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
@@ -0,0 +1,49 @@
+From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001
+From: "liberato@chromium.org" <liberato@chromium.org>
+Date: Fri, 6 Aug 2021 04:25:31 +0000
+Subject: [PATCH] FFmpeg M94 roll.
+
+Contains DEPS update + chromium-side fixes.
+
+Bug: 1227259
+Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889
+Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
+Commit-Queue: Frank Liberato <liberato@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#909174}
+---
+ media/ffmpeg/ffmpeg_common.h | 1 +
+ media/filters/ffmpeg_demuxer.cc | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
+index cede8ac5a7..97d6307e28 100644
+--- a/media/ffmpeg/ffmpeg_common.h
++++ b/media/ffmpeg/ffmpeg_common.h
+@@ -29,6 +29,7 @@ extern "C" {
+ #include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
++#include <libavutil/channel_layout.h>
+ #include <libavutil/imgutils.h>
+ #include <libavutil/log.h>
+ #include <libavutil/mastering_display_metadata.h>
+diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
+index ac4713b072..605001d935 100644
+--- a/media/filters/ffmpeg_demuxer.cc
++++ b/media/filters/ffmpeg_demuxer.cc
+@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
+
+ // Next try to use the first DTS value, for codecs where we know PTS == DTS
+ // (excludes all H26x codecs). The start time must be returned in PTS.
+- if (stream->first_dts != kNoFFmpegTimestamp &&
++ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
+ stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
+ stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
+ stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
+ const base::TimeDelta first_pts =
+- ConvertFromTimeBase(stream->time_base, stream->first_dts);
++ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
+ if (first_pts < start_time)
+ start_time = first_pts;
+ }
diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/chromium-webrtc-r0.patch b/srcpkgs/chromium/patches/chromium-webrtc-r0.patch
deleted file mode 100644
index 67574f6d540c..000000000000
--- a/srcpkgs/chromium/patches/chromium-webrtc-r0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream: Yes, https://webrtc-review.googlesource.com/9384
-Reason: Fixes musl builds of webrtc
-
-From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Fri, 13 Oct 2017 15:49:32 +0200
-Subject: [PATCH] IWYU: Include math.h for round(3).
-
-math.h was being implicitly included, which can break the build with
-alternative libc implementations.
-
-Bug: None
-Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
-Reviewed-on: https://webrtc-review.googlesource.com/9384
-Reviewed-by: Tommi <tommi@webrtc.org>
-Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
-Cr-Commit-Position: refs/heads/master@{#20292}
----
-
---- a/third_party/webrtc/p2p/base/port.cc
-+++ b/third_party/webrtc/p2p/base/port.cc
-@@ -10,6 +10,8 @@
-
- #include "p2p/base/port.h"
-
-+#include <math.h>
-+
- #include <algorithm>
- #include <vector>
-
---
-2.15.0.rc2
-
diff --git a/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch b/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
deleted file mode 100644
index 4a99f1de2874..000000000000
--- a/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
+++ /dev/null
@@ -1,1384 +0,0 @@
-From 4b438323d68840453b5ef826c3997568e2e0e8c7 Mon Sep 17 00:00:00 2001
-From: Matthew Denton <mpdenton@chromium.org>
-Date: Mon, 19 Jul 2021 14:03:13 +0000
-Subject: [PATCH] Reland "Reland "Linux sandbox syscall broker: use struct
- kernel_stat""
-
-This reverts commit ff277a52ece0b216617d770f201ed66955fe70b9.
-
-Reason for revert: reland
-
-The fix included in the reland is that fstatat64() needs to be
-allowed in the broker process's seccomp policy.
-
-This CL also includes some extra tests that the kernel_stat structures
-match the layout the kernel expects.
-
-Bug: 1164975, 1199431
-Test: trogdor Chromebook successfully boots and allows login.
-
-Original change's description:
-> Revert "Reland "Linux sandbox syscall broker: use struct kernel_stat""
->
-> This reverts commit cffbc4432af79f720ae3c75dff380b853701bd64.
->
-> Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1199431
->
-> Original change's description:
-> > Reland "Linux sandbox syscall broker: use struct kernel_stat"
-> >
-> > This reverts commit 23030dc650cdfa22631f25bef937905f27f06a2c.
-> >
-> > Original change's description:
-> > > Revert "Linux sandbox syscall broker: use struct kernel_stat"
-> > >
-> > > This reverts commit 784b0fcd8a3ca6bcd3acb9cfd624ec9cbbac2789.
-> > >
-> > > Reason for revert: Causing failure in
-> > > Step "sandbox_linux_unittests" failing on builder "Linux ChromiumOS MSan Tests"
-> > > See crbug.com/1198480
-> > >
-> > > Original change's description:
-> > > > Linux sandbox syscall broker: use struct kernel_stat
-> > > >
-> > > > The struct stat used in libc is different (in size and field ordering)
-> > > > from the structure assumed by the Linux kernel. So, when emulating
-> > > > system calls, we need to use the struct definition the kernel expects.
-> > > >
-> > > > This CL adds linux_stat.h that includes definitions of the different
-> > > > kernel structs.
-> > > >
-> > > > Change-Id: I53cad35c2251dff0f6b7ea77528cfa58ef3cab4a
-> > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2780876
-> > > > Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> > > > Reviewed-by: Robert Sesek <rsesek@chromium.org>
-> > > > Cr-Commit-Position: refs/heads/master@{#871767}
-> > >
-> > > Change-Id: Icbec38f2103c8424dec79ab1870b97c3e83f9361
-> > > No-Presubmit: true
-> > > No-Tree-Checks: true
-> > > No-Try: true
-> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2821812
-> > > Auto-Submit: Victor Vianna <victorvianna@google.com>
-> > > Owners-Override: Victor Vianna <victorvianna@google.com>
-> > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-> > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-> > > Cr-Commit-Position: refs/heads/master@{#871882}
-> >
-> > Change-Id: I1f39bb5242961474def594ff7dbea52009f2cee4
-> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2824115
-> > Auto-Submit: Matthew Denton <mpdenton@chromium.org>
-> > Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> > Reviewed-by: Robert Sesek <rsesek@chromium.org>
-> > Cr-Commit-Position: refs/heads/master@{#872812}
->
-> Fixed: 1199431
-> Change-Id: Iebfc0c48201bf22ff9c54d8d5c8a43d26a880098
-> No-Presubmit: true
-> No-Tree-Checks: true
-> No-Try: true
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2830459
-> Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
-> Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
-> Reviewed-by: Matthew Denton <mpdenton@chromium.org>
-> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
-> Owners-Override: Kinuko Yasuda <kinuko@chromium.org>
-> Cr-Commit-Position: refs/heads/master@{#873173}
-
-Change-Id: Ibe6a485070f33489aaa157b51b908c2d23d174d7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2848936
-Reviewed-by: Robert Sesek <rsesek@chromium.org>
-Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#902981}
----
- sandbox/linux/BUILD.gn | 1 +
- .../seccomp_broker_process_unittest.cc | 40 +++-
- sandbox/linux/seccomp-bpf-helpers/DEPS | 1 -
- ...scall_parameters_restrictions_unittests.cc | 4 -
- sandbox/linux/services/syscall_wrappers.cc | 50 ++++-
- sandbox/linux/services/syscall_wrappers.h | 15 ++
- .../services/syscall_wrappers_unittest.cc | 129 +++++++++++-
- sandbox/linux/syscall_broker/DEPS | 3 +-
- sandbox/linux/syscall_broker/broker_client.cc | 4 +-
- sandbox/linux/syscall_broker/broker_client.h | 4 +-
- sandbox/linux/syscall_broker/broker_host.cc | 23 ++-
- .../syscall_broker/broker_process_unittest.cc | 74 +++----
- .../remote_syscall_arg_handler_unittest.cc | 36 ++--
- .../syscall_broker/syscall_dispatcher.cc | 67 ++++---
- .../linux/syscall_broker/syscall_dispatcher.h | 27 ++-
- sandbox/linux/system_headers/linux_stat.h | 188 ++++++++++++++++++
- sandbox/linux/system_headers/linux_time.h | 26 +++
- sandbox/linux/tests/test_utils.cc | 15 ++
- sandbox/linux/tests/test_utils.h | 2 +
- .../policy/linux/bpf_broker_policy_linux.cc | 4 +-
- 20 files changed, 595 insertions(+), 118 deletions(-)
- create mode 100644 sandbox/linux/system_headers/linux_stat.h
-
-diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
-index 2f778dd0bcab2..ccbbc91716e71 100644
---- a/sandbox/linux/BUILD.gn
-+++ b/sandbox/linux/BUILD.gn
-@@ -443,6 +443,7 @@ source_set("sandbox_services_headers") {
- "system_headers/linux_ptrace.h",
- "system_headers/linux_seccomp.h",
- "system_headers/linux_signal.h",
-+ "system_headers/linux_stat.h",
- "system_headers/linux_syscalls.h",
- "system_headers/linux_time.h",
- "system_headers/linux_ucontext.h",
-diff --git a/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc b/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-index 9da9c68911428..8a941983b198d 100644
---- a/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-+++ b/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-@@ -34,6 +34,7 @@
- #include "sandbox/linux/syscall_broker/broker_file_permission.h"
- #include "sandbox/linux/syscall_broker/broker_process.h"
- #include "sandbox/linux/system_headers/linux_seccomp.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
- #include "sandbox/linux/tests/scoped_temporary_file.h"
- #include "sandbox/linux/tests/test_utils.h"
-@@ -202,6 +203,26 @@ namespace {
- // not accept this as a valid error number. E.g. bionic accepts up to 255, glibc
- // and musl up to 4096.
- const int kFakeErrnoSentinel = 254;
-+
-+void ConvertKernelStatToLibcStat(default_stat_struct& in_stat,
-+ struct stat& out_stat) {
-+ out_stat.st_dev = in_stat.st_dev;
-+ out_stat.st_ino = in_stat.st_ino;
-+ out_stat.st_mode = in_stat.st_mode;
-+ out_stat.st_nlink = in_stat.st_nlink;
-+ out_stat.st_uid = in_stat.st_uid;
-+ out_stat.st_gid = in_stat.st_gid;
-+ out_stat.st_rdev = in_stat.st_rdev;
-+ out_stat.st_size = in_stat.st_size;
-+ out_stat.st_blksize = in_stat.st_blksize;
-+ out_stat.st_blocks = in_stat.st_blocks;
-+ out_stat.st_atim.tv_sec = in_stat.st_atime_;
-+ out_stat.st_atim.tv_nsec = in_stat.st_atime_nsec_;
-+ out_stat.st_mtim.tv_sec = in_stat.st_mtime_;
-+ out_stat.st_mtim.tv_nsec = in_stat.st_mtime_nsec_;
-+ out_stat.st_ctim.tv_sec = in_stat.st_ctime_;
-+ out_stat.st_ctim.tv_nsec = in_stat.st_ctime_nsec_;
-+}
- } // namespace
-
- // There are a variety of ways to make syscalls in a sandboxed process. One is
-@@ -217,6 +238,10 @@ class Syscaller {
-
- virtual int Open(const char* filepath, int flags) = 0;
- virtual int Access(const char* filepath, int mode) = 0;
-+ // NOTE: we use struct stat instead of default_stat_struct, to make the libc
-+ // syscaller simpler. Copying from default_stat_struct (the structure returned
-+ // from a stat sycall) to struct stat (the structure exposed by a libc to its
-+ // users) is simpler than going in the opposite direction.
- virtual int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) = 0;
-@@ -243,8 +268,12 @@ class IPCSyscaller : public Syscaller {
- int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) override {
-- return broker_->GetBrokerClientSignalBased()->Stat(filepath, follow_links,
-- statbuf);
-+ default_stat_struct buf;
-+ int ret = broker_->GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ filepath, follow_links, &buf);
-+ if (ret >= 0)
-+ ConvertKernelStatToLibcStat(buf, *statbuf);
-+ return ret;
- }
-
- int Rename(const char* oldpath, const char* newpath) override {
-@@ -300,10 +329,13 @@ class DirectSyscaller : public Syscaller {
- int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) override {
-- int ret = follow_links ? syscall(__NR_stat, filepath, statbuf)
-- : syscall(__NR_lstat, filepath, statbuf);
-+ struct kernel_stat buf;
-+ int ret = syscall(__NR_newfstatat, AT_FDCWD, filepath, &buf,
-+ follow_links ? 0 : AT_SYMLINK_NOFOLLOW);
- if (ret < 0)
- return -errno;
-+
-+ ConvertKernelStatToLibcStat(buf, *statbuf);
- return ret;
- }
-
-diff --git a/sandbox/linux/seccomp-bpf-helpers/DEPS b/sandbox/linux/seccomp-bpf-helpers/DEPS
-index 4419fd1da34e8..95d1bb6cbbabf 100644
---- a/sandbox/linux/seccomp-bpf-helpers/DEPS
-+++ b/sandbox/linux/seccomp-bpf-helpers/DEPS
-@@ -3,5 +3,4 @@ include_rules = [
- "+sandbox/linux/seccomp-bpf",
- "+sandbox/linux/services",
- "+sandbox/linux/system_headers",
-- "+third_party/lss/linux_syscall_support.h",
- ]
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-index 903e702eab14b..76c393032c1fe 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-@@ -37,10 +37,6 @@
- #include "sandbox/linux/system_headers/linux_time.h"
- #include "sandbox/linux/tests/unit_tests.h"
-
--#if !defined(OS_ANDROID)
--#include "third_party/lss/linux_syscall_support.h" // for MAKE_PROCESS_CPUCLOCK
--#endif
--
- namespace sandbox {
-
- namespace {
-diff --git a/sandbox/linux/services/syscall_wrappers.cc b/sandbox/linux/services/syscall_wrappers.cc
-index fcfd2aa129d4b..3bec18a14e91e 100644
---- a/sandbox/linux/services/syscall_wrappers.cc
-+++ b/sandbox/linux/services/syscall_wrappers.cc
-@@ -4,6 +4,7 @@
-
- #include "sandbox/linux/services/syscall_wrappers.h"
-
-+#include <fcntl.h>
- #include <pthread.h>
- #include <sched.h>
- #include <setjmp.h>
-@@ -14,11 +15,13 @@
- #include <unistd.h>
- #include <cstring>
-
-+#include "base/check.h"
- #include "base/compiler_specific.h"
- #include "base/logging.h"
- #include "build/build_config.h"
- #include "sandbox/linux/system_headers/capability.h"
- #include "sandbox/linux/system_headers/linux_signal.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
-
- namespace sandbox {
-@@ -217,7 +220,7 @@ asm(
- #undef STR
- #undef XSTR
-
--#endif
-+#endif // defined(ARCH_CPU_X86_FAMILY)
-
- int sys_sigaction(int signum,
- const struct sigaction* act,
-@@ -241,7 +244,7 @@ int sys_sigaction(int signum,
- #error "Unsupported architecture."
- #endif
- }
--#endif
-+#endif // defined(ARCH_CPU_X86_FAMILY)
- }
-
- LinuxSigAction linux_oldact = {};
-@@ -259,6 +262,47 @@ int sys_sigaction(int signum,
- return result;
- }
-
--#endif // defined(MEMORY_SANITIZER)
-+#endif // !defined(OS_NACL_NONSFI)
-+
-+int sys_stat(const char* path, struct kernel_stat* stat_buf) {
-+ int res;
-+#if !defined(__NR_stat)
-+ res = syscall(__NR_newfstatat, AT_FDCWD, path, stat_buf, 0);
-+#else
-+ res = syscall(__NR_stat, path, stat_buf);
-+#endif
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+}
-+
-+int sys_lstat(const char* path, struct kernel_stat* stat_buf) {
-+ int res;
-+#if !defined(__NR_lstat)
-+ res = syscall(__NR_newfstatat, AT_FDCWD, path, stat_buf, AT_SYMLINK_NOFOLLOW);
-+#else
-+ res = syscall(__NR_lstat, path, stat_buf);
-+#endif
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+}
-+
-+int sys_fstatat64(int dirfd,
-+ const char* pathname,
-+ struct kernel_stat64* stat_buf,
-+ int flags) {
-+#if defined(__NR_fstatat64)
-+ int res = syscall(__NR_fstatat64, dirfd, pathname, stat_buf, flags);
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+#else // defined(__NR_fstatat64)
-+ // We should not reach here on 64-bit systems, as the *stat*64() are only
-+ // necessary on 32-bit.
-+ RAW_CHECK(false);
-+ return -ENOSYS;
-+#endif
-+}
-
- } // namespace sandbox
-diff --git a/sandbox/linux/services/syscall_wrappers.h b/sandbox/linux/services/syscall_wrappers.h
-index 1975bfbd88a6d..b55340e4a26b7 100644
---- a/sandbox/linux/services/syscall_wrappers.h
-+++ b/sandbox/linux/services/syscall_wrappers.h
-@@ -17,6 +17,8 @@ struct sock_fprog;
- struct rlimit64;
- struct cap_hdr;
- struct cap_data;
-+struct kernel_stat;
-+struct kernel_stat64;
-
- namespace sandbox {
-
-@@ -84,6 +86,19 @@ SANDBOX_EXPORT int sys_sigaction(int signum,
- const struct sigaction* act,
- struct sigaction* oldact);
-
-+// Some architectures do not have stat() and lstat() syscalls. In that case,
-+// these wrappers will use newfstatat(), which is available on all other
-+// architectures, with the same capabilities as stat() and lstat().
-+SANDBOX_EXPORT int sys_stat(const char* path, struct kernel_stat* stat_buf);
-+SANDBOX_EXPORT int sys_lstat(const char* path, struct kernel_stat* stat_buf);
-+
-+// Takes care of unpoisoning |stat_buf| for MSAN. Check-fails if fstatat64() is
-+// not a supported syscall on the current platform.
-+SANDBOX_EXPORT int sys_fstatat64(int dirfd,
-+ const char* pathname,
-+ struct kernel_stat64* stat_buf,
-+ int flags);
-+
- } // namespace sandbox
-
- #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
-diff --git a/sandbox/linux/services/syscall_wrappers_unittest.cc b/sandbox/linux/services/syscall_wrappers_unittest.cc
-index 32820f60a8cee..64b9cea80f319 100644
---- a/sandbox/linux/services/syscall_wrappers_unittest.cc
-+++ b/sandbox/linux/services/syscall_wrappers_unittest.cc
-@@ -5,15 +5,19 @@
- #include "sandbox/linux/services/syscall_wrappers.h"
-
- #include <stdint.h>
-+#include <string.h>
- #include <sys/syscall.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
--#include <cstring>
-
-+#include "base/logging.h"
-+#include "base/memory/page_size.h"
- #include "base/posix/eintr_wrapper.h"
- #include "build/build_config.h"
- #include "sandbox/linux/system_headers/linux_signal.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
-+#include "sandbox/linux/tests/scoped_temporary_file.h"
- #include "sandbox/linux/tests/test_utils.h"
- #include "sandbox/linux/tests/unit_tests.h"
- #include "testing/gtest/include/gtest/gtest.h"
-@@ -93,6 +97,129 @@ TEST(SyscallWrappers, LinuxSigSet) {
- linux_sigset);
- }
-
-+TEST(SyscallWrappers, Stat) {
-+ // Create a file to stat, with 12 bytes of data.
-+ ScopedTemporaryFile tmp_file;
-+ EXPECT_EQ(12, write(tmp_file.fd(), "blahblahblah", 12));
-+
-+ // To test we have the correct stat structures for each kernel/platform, we
-+ // will right-align them on a page, with a guard page after.
-+ char* two_pages = static_cast<char*>(TestUtils::MapPagesOrDie(2));
-+ TestUtils::MprotectLastPageOrDie(two_pages, 2);
-+ char* page1_end = two_pages + base::GetPageSize();
-+
-+ // First, check that calling stat with |stat_buf| pointing to the last byte on
-+ // a page causes EFAULT.
-+ int res = sys_stat(tmp_file.full_file_name(),
-+ reinterpret_cast<struct kernel_stat*>(page1_end - 1));
-+ ASSERT_EQ(res, -1);
-+ ASSERT_EQ(errno, EFAULT);
-+
-+ // Now, check that we have the correctly sized stat structure.
-+ struct kernel_stat* sb = reinterpret_cast<struct kernel_stat*>(
-+ page1_end - sizeof(struct kernel_stat));
-+ // Memset to c's so we can check the kernel zero'd the padding...
-+ memset(sb, 'c', sizeof(struct kernel_stat));
-+ res = sys_stat(tmp_file.full_file_name(), sb);
-+ ASSERT_EQ(res, 0);
-+
-+ // Following fields may never be consistent but should be non-zero.
-+ // Don't trust the platform to define fields with any particular sign.
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_dev));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_ino));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_mode));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_blksize));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_blocks));
-+
-+// We are the ones that made the file.
-+// Note: normally gid and uid overflow on backwards-compatible 32-bit systems
-+// and we end up with dummy uids and gids in place here.
-+#if defined(ARCH_CPU_64_BITS)
-+ EXPECT_EQ(geteuid(), sb->st_uid);
-+ EXPECT_EQ(getegid(), sb->st_gid);
-+#endif
-+
-+ // Wrote 12 bytes above which should fit in one block.
-+ EXPECT_EQ(12u, sb->st_size);
-+
-+ // Can't go backwards in time, 1500000000 was some time ago.
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_atime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_mtime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_ctime_));
-+
-+ // Checking the padding for good measure.
-+#if defined(__x86_64__)
-+ EXPECT_EQ(0u, sb->__pad0);
-+ EXPECT_EQ(0u, sb->__unused4[0]);
-+ EXPECT_EQ(0u, sb->__unused4[1]);
-+ EXPECT_EQ(0u, sb->__unused4[2]);
-+#elif defined(__aarch64__)
-+ EXPECT_EQ(0u, sb->__pad1);
-+ EXPECT_EQ(0, sb->__pad2);
-+ EXPECT_EQ(0u, sb->__unused4);
-+ EXPECT_EQ(0u, sb->__unused5);
-+#endif
-+}
-+
-+TEST(SyscallWrappers, LStat) {
-+ // Create a file to stat, with 12 bytes of data.
-+ ScopedTemporaryFile tmp_file;
-+ EXPECT_EQ(12, write(tmp_file.fd(), "blahblahblah", 12));
-+
-+ // Also create a symlink.
-+ std::string symlink_name;
-+ {
-+ ScopedTemporaryFile tmp_file2;
-+ symlink_name = tmp_file2.full_file_name();
-+ }
-+ int rc = symlink(tmp_file.full_file_name(), symlink_name.c_str());
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't symlink " << symlink_name << " to target "
-+ << tmp_file.full_file_name();
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat lstat_info;
-+ rc = sys_lstat(symlink_name.c_str(), &lstat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_lstat " << symlink_name;
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat stat_info;
-+ rc = sys_stat(symlink_name.c_str(), &stat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_stat " << symlink_name;
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat tmp_file_stat_info;
-+ rc = sys_stat(tmp_file.full_file_name(), &tmp_file_stat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_stat " << tmp_file.full_file_name();
-+ GTEST_FAIL();
-+ }
-+
-+ // lstat should produce information about a symlink.
-+ ASSERT_TRUE(S_ISLNK(lstat_info.st_mode));
-+
-+ // stat-ing symlink_name and tmp_file should produce the same inode.
-+ ASSERT_EQ(stat_info.st_ino, tmp_file_stat_info.st_ino);
-+
-+ // lstat-ing symlink_name should give a different inode than stat-ing
-+ // symlink_name.
-+ ASSERT_NE(stat_info.st_ino, lstat_info.st_ino);
-+}
-+
- } // namespace
-
- } // namespace sandbox
-diff --git a/sandbox/linux/syscall_broker/DEPS b/sandbox/linux/syscall_broker/DEPS
-index c477f7d36394b..149c463b06839 100644
---- a/sandbox/linux/syscall_broker/DEPS
-+++ b/sandbox/linux/syscall_broker/DEPS
-@@ -1,4 +1,5 @@
- include_rules = [
-- "+sandbox/linux/system_headers",
- "+sandbox/linux/bpf_dsl",
-+ "+sandbox/linux/services",
-+ "+sandbox/linux/system_headers",
- ]
-diff --git a/sandbox/linux/syscall_broker/broker_client.cc b/sandbox/linux/syscall_broker/broker_client.cc
-index 6b1b5be433899..e24f659fcf872 100644
---- a/sandbox/linux/syscall_broker/broker_client.cc
-+++ b/sandbox/linux/syscall_broker/broker_client.cc
-@@ -166,7 +166,7 @@ int BrokerClient::Rmdir(const char* path) const {
-
- int BrokerClient::Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const {
-+ struct kernel_stat* sb) const {
- if (!pathname || !sb)
- return -EFAULT;
-
-@@ -181,7 +181,7 @@ int BrokerClient::Stat(const char* pathname,
-
- int BrokerClient::Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const {
-+ struct kernel_stat64* sb) const {
- if (!pathname || !sb)
- return -EFAULT;
-
-diff --git a/sandbox/linux/syscall_broker/broker_client.h b/sandbox/linux/syscall_broker/broker_client.h
-index 05e14c83f2010..26ca78101c71c 100644
---- a/sandbox/linux/syscall_broker/broker_client.h
-+++ b/sandbox/linux/syscall_broker/broker_client.h
-@@ -61,10 +61,10 @@ class SANDBOX_EXPORT BrokerClient : public SyscallDispatcher {
- int Rmdir(const char* path) const override;
- int Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const override;
-+ struct kernel_stat* sb) const override;
- int Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const override;
-+ struct kernel_stat64* sb) const override;
- int Unlink(const char* unlink) const override;
-
- private:
-diff --git a/sandbox/linux/syscall_broker/broker_host.cc b/sandbox/linux/syscall_broker/broker_host.cc
-index 1cd03a18df809..1cdc01a888f41 100644
---- a/sandbox/linux/syscall_broker/broker_host.cc
-+++ b/sandbox/linux/syscall_broker/broker_host.cc
-@@ -20,9 +20,11 @@
- #include "base/files/scoped_file.h"
- #include "base/logging.h"
- #include "base/posix/eintr_wrapper.h"
-+#include "sandbox/linux/services/syscall_wrappers.h"
- #include "sandbox/linux/syscall_broker/broker_command.h"
- #include "sandbox/linux/syscall_broker/broker_permission_list.h"
- #include "sandbox/linux/syscall_broker/broker_simple_message.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
-
- namespace sandbox {
-@@ -193,10 +195,12 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(reply->AddIntToMessage(-permission_list.denied_errno()));
- return;
- }
-+
- if (command_type == COMMAND_STAT) {
-- struct stat sb;
-- int sts =
-- follow_links ? stat(file_to_access, &sb) : lstat(file_to_access, &sb);
-+ struct kernel_stat sb;
-+
-+ int sts = follow_links ? sandbox::sys_stat(file_to_access, &sb)
-+ : sandbox::sys_lstat(file_to_access, &sb);
- if (sts < 0) {
- RAW_CHECK(reply->AddIntToMessage(-errno));
- return;
-@@ -205,10 +209,12 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(
- reply->AddDataToMessage(reinterpret_cast<char*>(&sb), sizeof(sb)));
- } else {
-+#if defined(__NR_fstatat64)
- DCHECK(command_type == COMMAND_STAT64);
-- struct stat64 sb;
-- int sts = follow_links ? stat64(file_to_access, &sb)
-- : lstat64(file_to_access, &sb);
-+ struct kernel_stat64 sb;
-+
-+ int sts = sandbox::sys_fstatat64(AT_FDCWD, file_to_access, &sb,
-+ follow_links ? 0 : AT_SYMLINK_NOFOLLOW);
- if (sts < 0) {
- RAW_CHECK(reply->AddIntToMessage(-errno));
- return;
-@@ -216,6 +222,11 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(reply->AddIntToMessage(0));
- RAW_CHECK(
- reply->AddDataToMessage(reinterpret_cast<char*>(&sb), sizeof(sb)));
-+#else // defined(__NR_fstatat64)
-+ // We should not reach here on 64-bit systems, as the *stat*64() are only
-+ // necessary on 32-bit.
-+ RAW_CHECK(false);
-+#endif
- }
- }
-
-diff --git a/sandbox/linux/syscall_broker/broker_process_unittest.cc b/sandbox/linux/syscall_broker/broker_process_unittest.cc
-index 55ba6bccb29ec..c65f25a78a999 100644
---- a/sandbox/linux/syscall_broker/broker_process_unittest.cc
-+++ b/sandbox/linux/syscall_broker/broker_process_unittest.cc
-@@ -811,7 +811,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- const char* bad_leading_path5 = "/mbogo/fictitioux";
- const char* bad_leading_path6 = "/mbogo/fictitiousa";
-
-- struct stat sb;
-+ default_stat_struct sb;
-
- {
- // Actual file with permissions to see file but command not allowed.
-@@ -824,7 +824,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- tempfile_name, follow_links, &sb));
- }
-
-@@ -840,7 +840,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- nonesuch_name, follow_links, &sb));
- }
- {
-@@ -852,7 +852,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- tempfile_name, follow_links, &sb));
- }
- {
-@@ -864,38 +864,39 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- nonesuch_name, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ nonesuch_name, follow_links, &sb));
-
- // Gets denied all the way back to root since no create permission.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path3, follow_links, &sb));
-
- // Not fooled by substrings.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path3, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path4, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path5, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path6, follow_links, &sb));
- }
- {
-@@ -907,37 +908,41 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- nonesuch_name, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ nonesuch_name, follow_links, &sb));
-
- // Gets ENOENT all the way back to root since it has create permission.
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path1, follow_links, &sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path2, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path1, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path2, follow_links, &sb));
-
- // But can always get the root.
-- EXPECT_EQ(0, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path3, follow_links, &sb));
-+ EXPECT_EQ(0,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path3, follow_links, &sb));
-
- // Not fooled by substrings.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path3, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path4, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path5, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path6, follow_links, &sb));
- }
- {
-@@ -949,8 +954,9 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(0, open_broker.GetBrokerClientSignalBased()->Stat(
-- tempfile_name, follow_links, &sb));
-+ EXPECT_EQ(0,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ tempfile_name, follow_links, &sb));
-
- // Following fields may never be consistent but should be non-zero.
- // Don't trust the platform to define fields with any particular sign.
-@@ -968,9 +974,9 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- EXPECT_EQ(12, sb.st_size);
-
- // Can't go backwards in time, 1500000000 was some time ago.
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_atime));
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_mtime));
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_ctime));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_atime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_mtime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_ctime_));
- }
- }
-
-diff --git a/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc b/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-index fffa9bb7082ce..f517a9867c5de 100644
---- a/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-+++ b/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-@@ -16,6 +16,7 @@
- #include "base/memory/page_size.h"
- #include "base/posix/unix_domain_socket.h"
- #include "base/test/bind.h"
-+#include "sandbox/linux/tests/test_utils.h"
- #include "sandbox/linux/tests/unit_tests.h"
- #include "testing/gtest/include/gtest/gtest.h"
-
-@@ -52,19 +53,6 @@ void VerifyCorrectString(std::string str, size_t size) {
- }
- }
-
--void* MapPagesOrDie(size_t num_pages) {
-- void* addr = mmap(nullptr, num_pages * base::GetPageSize(),
-- PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-- PCHECK(addr);
-- return addr;
--}
--
--void MprotectLastPageOrDie(char* addr, size_t num_pages) {
-- size_t last_page_offset = (num_pages - 1) * base::GetPageSize();
-- PCHECK(mprotect(addr + last_page_offset, base::GetPageSize(), PROT_NONE) >=
-- 0);
--}
--
- pid_t ForkWaitingChild(base::OnceCallback<void(int)>
- after_parent_signals_callback = base::DoNothing(),
- base::ScopedFD* parent_sync_fd = nullptr) {
-@@ -105,13 +93,13 @@ void ReadTest(const ReadTestConfig& test_config) {
- size_t total_pages = (test_config.start_at + test_config.total_size +
- base::GetPageSize() - 1) /
- base::GetPageSize();
-- char* mmap_addr = static_cast<char*>(MapPagesOrDie(total_pages));
-+ char* mmap_addr = static_cast<char*>(TestUtils::MapPagesOrDie(total_pages));
- char* addr = mmap_addr + test_config.start_at;
- FillBufferWithPath(addr, test_config.total_size,
- test_config.include_null_byte);
-
- if (test_config.last_page_inaccessible)
-- MprotectLastPageOrDie(mmap_addr, total_pages);
-+ TestUtils::MprotectLastPageOrDie(mmap_addr, total_pages);
-
- pid_t pid = ForkWaitingChild();
- munmap(mmap_addr, base::GetPageSize() * total_pages);
-@@ -212,7 +200,7 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChunkPlus1EndingOnePastPage) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChildExited) {
-- void* addr = MapPagesOrDie(1);
-+ void* addr = TestUtils::MapPagesOrDie(1);
- FillBufferWithPath(static_cast<char*>(addr), strlen(kPathPart) + 1, true);
-
- base::ScopedFD parent_sync, child_sync;
-@@ -240,10 +228,10 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChildExited) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, BasicWrite) {
-- void* read_from = MapPagesOrDie(1);
-+ void* read_from = TestUtils::MapPagesOrDie(1);
- const size_t write_size = base::GetPageSize();
- FillBufferWithPath(static_cast<char*>(read_from), write_size, false);
-- char* write_to = static_cast<char*>(MapPagesOrDie(1));
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(1));
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-
-@@ -278,8 +266,8 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, BasicWrite) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteToInvalidAddress) {
-- char* write_to = static_cast<char*>(MapPagesOrDie(1));
-- MprotectLastPageOrDie(write_to, 1);
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(1));
-+ TestUtils::MprotectLastPageOrDie(write_to, 1);
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-
-@@ -295,11 +283,11 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteToInvalidAddress) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WritePartiallyToInvalidAddress) {
-- char* read_from = static_cast<char*>(MapPagesOrDie(2));
-+ char* read_from = static_cast<char*>(TestUtils::MapPagesOrDie(2));
- const size_t write_size = base::GetPageSize();
- FillBufferWithPath(static_cast<char*>(read_from), write_size, false);
-- char* write_to = static_cast<char*>(MapPagesOrDie(2));
-- MprotectLastPageOrDie(write_to, 2);
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(2));
-+ TestUtils::MprotectLastPageOrDie(write_to, 2);
- write_to += base::GetPageSize() / 2;
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-@@ -314,7 +302,7 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WritePartiallyToInvalidAddress) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteChildExited) {
-- char* addr = static_cast<char*>(MapPagesOrDie(1));
-+ char* addr = static_cast<char*>(TestUtils::MapPagesOrDie(1));
- FillBufferWithPath(static_cast<char*>(addr), strlen(kPathPart) + 1, true);
-
- base::ScopedFD parent_sync, child_sync;
-diff --git a/sandbox/linux/syscall_broker/syscall_dispatcher.cc b/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-index b9ee93c14ac59..8a42397ef872e 100644
---- a/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-+++ b/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-@@ -19,8 +19,18 @@ namespace syscall_broker {
- #define BROKER_UNPOISON_STRING(x)
- #endif
-
-+int SyscallDispatcher::DefaultStatForTesting(const char* pathname,
-+ bool follow_links,
-+ default_stat_struct* sb) {
-+#if defined(__NR_fstatat64)
-+ return Stat64(pathname, follow_links, sb);
-+#elif defined(__NR_newfstatat)
-+ return Stat(pathname, follow_links, sb);
-+#endif
-+}
-+
- int SyscallDispatcher::PerformStatat(const arch_seccomp_data& args,
-- bool arch64) {
-+ bool stat64) {
- if (static_cast<int>(args.args[0]) != AT_FDCWD)
- return -EPERM;
- // Only allow the AT_SYMLINK_NOFOLLOW flag which is used by some libc
-@@ -30,13 +40,29 @@ int SyscallDispatcher::PerformStatat(const arch_seccomp_data& args,
-
- const bool follow_links =
- !(static_cast<int>(args.args[3]) & AT_SYMLINK_NOFOLLOW);
-- if (arch64) {
-+ if (stat64) {
- return Stat64(reinterpret_cast<const char*>(args.args[1]), follow_links,
-- reinterpret_cast<struct stat64*>(args.args[2]));
-+ reinterpret_cast<struct kernel_stat64*>(args.args[2]));
- }
-
- return Stat(reinterpret_cast<const char*>(args.args[1]), follow_links,
-- reinterpret_cast<struct stat*>(args.args[2]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[2]));
-+}
-+
-+int SyscallDispatcher::PerformUnlinkat(const arch_seccomp_data& args) {
-+ if (static_cast<int>(args.args[0]) != AT_FDCWD)
-+ return -EPERM;
-+
-+ int flags = static_cast<int>(args.args[2]);
-+
-+ if (flags == AT_REMOVEDIR) {
-+ return Rmdir(reinterpret_cast<const char*>(args.args[1]));
-+ }
-+
-+ if (flags != 0)
-+ return -EPERM;
-+
-+ return Unlink(reinterpret_cast<const char*>(args.args[1]));
- }
-
- int SyscallDispatcher::DispatchSyscall(const arch_seccomp_data& args) {
-@@ -127,59 +153,42 @@ int SyscallDispatcher::DispatchSyscall(const arch_seccomp_data& args) {
- #if defined(__NR_stat)
- case __NR_stat:
- return Stat(reinterpret_cast<const char*>(args.args[0]), true,
-- reinterpret_cast<struct stat*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[1]));
- #endif
- #if defined(__NR_stat64)
- case __NR_stat64:
- return Stat64(reinterpret_cast<const char*>(args.args[0]), true,
-- reinterpret_cast<struct stat64*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat64*>(args.args[1]));
- #endif
- #if defined(__NR_lstat)
- case __NR_lstat:
- // See https://crbug.com/847096
- BROKER_UNPOISON_STRING(reinterpret_cast<const char*>(args.args[0]));
- return Stat(reinterpret_cast<const char*>(args.args[0]), false,
-- reinterpret_cast<struct stat*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[1]));
- #endif
- #if defined(__NR_lstat64)
- case __NR_lstat64:
- // See https://crbug.com/847096
- BROKER_UNPOISON_STRING(reinterpret_cast<const char*>(args.args[0]));
- return Stat64(reinterpret_cast<const char*>(args.args[0]), false,
-- reinterpret_cast<struct stat64*>(args.args[1]));
--#endif
--#if defined(__NR_fstatat)
-- case __NR_fstatat:
-- return PerformStatat(args, /*arch64=*/false);
-+ reinterpret_cast<struct kernel_stat64*>(args.args[1]));
- #endif
- #if defined(__NR_fstatat64)
- case __NR_fstatat64:
-- return PerformStatat(args, /*arch64=*/true);
-+ return PerformStatat(args, /*stat64=*/true);
- #endif
- #if defined(__NR_newfstatat)
- case __NR_newfstatat:
-- return PerformStatat(args, /*arch64=*/false);
-+ return PerformStatat(args, /*stat64=*/false);
- #endif
- #if defined(__NR_unlink)
- case __NR_unlink:
- return Unlink(reinterpret_cast<const char*>(args.args[0]));
- #endif
- #if defined(__NR_unlinkat)
-- case __NR_unlinkat: {
-- if (static_cast<int>(args.args[0]) != AT_FDCWD)
-- return -EPERM;
--
-- int flags = static_cast<int>(args.args[2]);
--
-- if (flags == AT_REMOVEDIR) {
-- return Rmdir(reinterpret_cast<const char*>(args.args[1]));
-- }
--
-- if (flags != 0)
-- return -EPERM;
--
-- return Unlink(reinterpret_cast<const char*>(args.args[1]));
-- }
-+ case __NR_unlinkat:
-+ return PerformUnlinkat(args);
- #endif // defined(__NR_unlinkat)
- default:
- RAW_CHECK(false);
-diff --git a/sandbox/linux/syscall_broker/syscall_dispatcher.h b/sandbox/linux/syscall_broker/syscall_dispatcher.h
-index d8b8874ad9ce4..1d6653caf3bd2 100644
---- a/sandbox/linux/syscall_broker/syscall_dispatcher.h
-+++ b/sandbox/linux/syscall_broker/syscall_dispatcher.h
-@@ -9,13 +9,15 @@
- #include <cstddef>
-
- #include "sandbox/linux/system_headers/linux_seccomp.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
-+#include "sandbox/sandbox_export.h"
-
- namespace sandbox {
- namespace syscall_broker {
-
- // An abstract class that defines all the system calls we perform for the
- // sandboxed process.
--class SyscallDispatcher {
-+class SANDBOX_EXPORT SyscallDispatcher {
- public:
- // Emulates access()/faccessat().
- // X_OK will always return an error in practice since the broker process
-@@ -40,19 +42,34 @@ class SyscallDispatcher {
- virtual int Rmdir(const char* path) const = 0;
-
- // Emulates stat()/stat64()/lstat()/lstat64()/fstatat()/newfstatat().
-+ // Stat64 is only available on 32-bit systems.
- virtual int Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const = 0;
-+ struct kernel_stat* sb) const = 0;
- virtual int Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const = 0;
-+ struct kernel_stat64* sb) const = 0;
-
- // Emulates unlink()/unlinkat().
- virtual int Unlink(const char* unlink) const = 0;
-
-+ // Different architectures use a different syscall from the stat family by
-+ // default in glibc. E.g. 32-bit systems use *stat*64() and fill out struct
-+ // kernel_stat64, whereas 64-bit systems use *stat*() and fill out struct
-+ // kernel_stat. Some tests want to call the SyscallDispatcher directly, and
-+ // should be using the default stat in order to test against glibc.
-+ int DefaultStatForTesting(const char* pathname,
-+ bool follow_links,
-+ default_stat_struct* sb);
-+
- // Validates the args passed to a *statat*() syscall and performs the syscall
-- // using Stat() or Stat64().
-- int PerformStatat(const arch_seccomp_data& args, bool arch64);
-+ // using Stat(), or on 32-bit systems it uses Stat64() for the *statat64()
-+ // syscalls.
-+ int PerformStatat(const arch_seccomp_data& args, bool stat64);
-+
-+ // Validates the args passed to an unlinkat() syscall and performs the syscall
-+ // using either Unlink() or Rmdir().
-+ int PerformUnlinkat(const arch_seccomp_data& args);
-
- // Reads the syscall number and arguments, imposes some policy (e.g. the *at()
- // system calls must only allow AT_FDCWD as the first argument), and
-diff --git a/sandbox/linux/system_headers/linux_stat.h b/sandbox/linux/system_headers/linux_stat.h
-new file mode 100644
-index 0000000000000..35788eb22a4e5
---- /dev/null
-+++ b/sandbox/linux/system_headers/linux_stat.h
-@@ -0,0 +1,188 @@
-+// Copyright 2021 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-+
-+#include <stdint.h>
-+
-+#include "build/build_config.h"
-+#include "sandbox/linux/system_headers/linux_syscalls.h"
-+
-+#if defined(ARCH_CPU_MIPS_FAMILY)
-+#if defined(ARCH_CPU_64_BITS)
-+struct kernel_stat {
-+#else
-+struct kernel_stat64 {
-+#endif
-+ unsigned st_dev;
-+ unsigned __pad0[3];
-+ unsigned long long st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned st_rdev;
-+ unsigned __pad1[3];
-+ long long st_size;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned st_blksize;
-+ unsigned __pad2;
-+ unsigned long long st_blocks;
-+};
-+#else
-+struct kernel_stat64 {
-+ unsigned long long st_dev;
-+ unsigned char __pad0[4];
-+ unsigned __st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned long long st_rdev;
-+ unsigned char __pad3[4];
-+ long long st_size;
-+ unsigned st_blksize;
-+ unsigned long long st_blocks;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned long long st_ino;
-+};
-+#endif
-+
-+#if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
-+struct kernel_stat {
-+ /* The kernel headers suggest that st_dev and st_rdev should be 32bit
-+ * quantities encoding 12bit major and 20bit minor numbers in an interleaved
-+ * format. In reality, we do not see useful data in the top bits. So,
-+ * we'll leave the padding in here, until we find a better solution.
-+ */
-+ unsigned short st_dev;
-+ short pad1;
-+ unsigned st_ino;
-+ unsigned short st_mode;
-+ unsigned short st_nlink;
-+ unsigned short st_uid;
-+ unsigned short st_gid;
-+ unsigned short st_rdev;
-+ short pad2;
-+ unsigned st_size;
-+ unsigned st_blksize;
-+ unsigned st_blocks;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned __unused4;
-+ unsigned __unused5;
-+};
-+#elif defined(__x86_64__)
-+struct kernel_stat {
-+ uint64_t st_dev;
-+ uint64_t st_ino;
-+ uint64_t st_nlink;
-+ unsigned st_mode;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned __pad0;
-+ uint64_t st_rdev;
-+ int64_t st_size;
-+ int64_t st_blksize;
-+ int64_t st_blocks;
-+ uint64_t st_atime_;
-+ uint64_t st_atime_nsec_;
-+ uint64_t st_mtime_;
-+ uint64_t st_mtime_nsec_;
-+ uint64_t st_ctime_;
-+ uint64_t st_ctime_nsec_;
-+ int64_t __unused4[3];
-+};
-+#elif (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+struct kernel_stat {
-+ unsigned st_dev;
-+ int st_pad1[3];
-+ unsigned st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned st_rdev;
-+ int st_pad2[2];
-+ long st_size;
-+ int st_pad3;
-+ long st_atime_;
-+ long st_atime_nsec_;
-+ long st_mtime_;
-+ long st_mtime_nsec_;
-+ long st_ctime_;
-+ long st_ctime_nsec_;
-+ int st_blksize;
-+ int st_blocks;
-+ int st_pad4[14];
-+};
-+#elif defined(__aarch64__)
-+struct kernel_stat {
-+ unsigned long st_dev;
-+ unsigned long st_ino;
-+ unsigned int st_mode;
-+ unsigned int st_nlink;
-+ unsigned int st_uid;
-+ unsigned int st_gid;
-+ unsigned long st_rdev;
-+ unsigned long __pad1;
-+ long st_size;
-+ int st_blksize;
-+ int __pad2;
-+ long st_blocks;
-+ long st_atime_;
-+ unsigned long st_atime_nsec_;
-+ long st_mtime_;
-+ unsigned long st_mtime_nsec_;
-+ long st_ctime_;
-+ unsigned long st_ctime_nsec_;
-+ unsigned int __unused4;
-+ unsigned int __unused5;
-+};
-+#endif
-+
-+// On 32-bit systems, we default to the 64-bit stat struct like libc
-+// implementations do. Otherwise we default to the normal stat struct which is
-+// already 64-bit.
-+// These defines make it easy to call the right syscall to fill out a 64-bit
-+// stat struct, which is the default in libc implementations but requires
-+// different syscall names on 32 and 64-bit platforms.
-+#if defined(__NR_fstatat64)
-+
-+namespace sandbox {
-+using default_stat_struct = struct kernel_stat64;
-+} // namespace sandbox
-+
-+#define __NR_fstatat_default __NR_fstatat64
-+#define __NR_fstat_default __NR_fstat64
-+
-+#elif defined(__NR_newfstatat)
-+
-+namespace sandbox {
-+using default_stat_struct = struct kernel_stat;
-+} // namespace sandbox
-+
-+#define __NR_fstatat_default __NR_newfstatat
-+#define __NR_fstat_default __NR_fstat
-+
-+#else
-+#error "one of fstatat64 and newfstatat must be defined"
-+#endif
-+
-+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-diff --git a/sandbox/linux/system_headers/linux_time.h b/sandbox/linux/system_headers/linux_time.h
-index 780f24dddd9fa..f18c806611f83 100644
---- a/sandbox/linux/system_headers/linux_time.h
-+++ b/sandbox/linux/system_headers/linux_time.h
-@@ -11,6 +11,32 @@
- #define CPUCLOCK_CLOCK_MASK 3
- #endif
-
-+#if !defined(CPUCLOCK_PROF)
-+#define CPUCLOCK_PROF 0
-+#endif
-+
-+#if !defined(CPUCLOCK_VIRT)
-+#define CPUCLOCK_VIRT 1
-+#endif
-+
-+#if !defined(CPUCLOCK_SCHED)
-+#define CPUCLOCK_SCHED 2
-+#endif
-+
-+#if !defined(CPUCLOCK_PERTHREAD_MASK)
-+#define CPUCLOCK_PERTHREAD_MASK 4
-+#endif
-+
-+#if !defined(MAKE_PROCESS_CPUCLOCK)
-+#define MAKE_PROCESS_CPUCLOCK(pid, clock) \
-+ ((int)(~(unsigned)(pid) << 3) | (int)(clock))
-+#endif
-+
-+#if !defined(MAKE_THREAD_CPUCLOCK)
-+#define MAKE_THREAD_CPUCLOCK(tid, clock) \
-+ ((int)(~(unsigned)(tid) << 3) | (int)((clock) | CPUCLOCK_PERTHREAD_MASK))
-+#endif
-+
- #if !defined(CLOCKFD)
- #define CLOCKFD 3
- #endif
-diff --git a/sandbox/linux/tests/test_utils.cc b/sandbox/linux/tests/test_utils.cc
-index 847c20b20c5d2..cf6041a4b476a 100644
---- a/sandbox/linux/tests/test_utils.cc
-+++ b/sandbox/linux/tests/test_utils.cc
-@@ -5,12 +5,14 @@
- #include "sandbox/linux/tests/test_utils.h"
-
- #include <errno.h>
-+#include <sys/mman.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
-
- #include "base/check_op.h"
-+#include "base/memory/page_size.h"
- #include "base/posix/eintr_wrapper.h"
-
- namespace sandbox {
-@@ -39,4 +41,17 @@ void TestUtils::HandlePostForkReturn(pid_t pid) {
- }
- }
-
-+void* TestUtils::MapPagesOrDie(size_t num_pages) {
-+ void* addr = mmap(nullptr, num_pages * base::GetPageSize(),
-+ PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-+ PCHECK(addr);
-+ return addr;
-+}
-+
-+void TestUtils::MprotectLastPageOrDie(char* addr, size_t num_pages) {
-+ size_t last_page_offset = (num_pages - 1) * base::GetPageSize();
-+ PCHECK(mprotect(addr + last_page_offset, base::GetPageSize(), PROT_NONE) >=
-+ 0);
-+}
-+
- } // namespace sandbox
-diff --git a/sandbox/linux/tests/test_utils.h b/sandbox/linux/tests/test_utils.h
-index 7cf9749fe4f1f..43b028b1e34ef 100644
---- a/sandbox/linux/tests/test_utils.h
-+++ b/sandbox/linux/tests/test_utils.h
-@@ -19,6 +19,8 @@ class TestUtils {
- // makes sure that if fork() succeeded the child exits
- // and the parent waits for it.
- static void HandlePostForkReturn(pid_t pid);
-+ static void* MapPagesOrDie(size_t num_pages);
-+ static void MprotectLastPageOrDie(char* addr, size_t num_pages);
-
- private:
- DISALLOW_IMPLICIT_CONSTRUCTORS(TestUtils);
-diff --git a/sandbox/policy/linux/bpf_broker_policy_linux.cc b/sandbox/policy/linux/bpf_broker_policy_linux.cc
-index 2963bb9ca8612..6dc8c0581b43c 100644
---- a/sandbox/policy/linux/bpf_broker_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_broker_policy_linux.cc
-@@ -93,8 +93,8 @@ ResultExpr BrokerProcessPolicy::EvaluateSyscall(int sysno) const {
- return Allow();
- break;
- #endif
--#if defined(__NR_fstatat)
-- case __NR_fstatat:
-+#if defined(__NR_fstatat64)
-+ case __NR_fstatat64:
- if (allowed_command_set_.test(syscall_broker::COMMAND_STAT))
- return Allow();
- break;
diff --git a/srcpkgs/chromium/patches/musl-stat.patch b/srcpkgs/chromium/patches/musl-stat.patch
new file mode 100644
index 000000000000..427be1a3f4c2
--- /dev/null
+++ b/srcpkgs/chromium/patches/musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/base/files/file.h.orig
++++ b/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+- defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++ defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++ (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch b/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
index d1db7e420154..420963b4b6eb 100644
--- a/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
+++ b/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
@@ -1,13 +1,13 @@
--- a/build/config/compiler/BUILD.gn.orig
+++ b/build/config/compiler/BUILD.gn
-@@ -1620,10 +1620,6 @@
+@@ -1624,10 +1624,6 @@
+ # TODO(https://crbug.com/1028110): Evaluate and possible enable.
+ "-Wno-deprecated-copy",
- # TODO(https://crbug.com/1050281): Clean up, enable.
- "-Wno-non-c-typedef-for-linkage",
--
- # TODO(https://crbug.com/1203071): Clean up and enable.
- "-Wno-unused-but-set-parameter",
- "-Wno-unused-but-set-variable",
+-
+ # TODO(https://crbug.com/1239077): Fix and re-enable.
+ "-Wno-inline-asm",
]
-
- cflags_c += [
diff --git a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..f0ce44c0a487
--- /dev/null
+++ b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
@@ -0,0 +1,66 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+---
+ build/config/compiler/BUILD.gn | 18 ++++++++++++------
+ build/config/compiler/compiler.gni | 7 ++-----
+ 2 files changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index ede07d111c..6db16c1cdd 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1216,12 +1216,19 @@ config("compiler_deterministic") {
+ # different build directory like "out/feature_a" and "out/feature_b" if
+ # we build same files with same compile flag.
+ # Other paths are already given in relative, no need to normalize them.
+- cflags += [
+- "-Xclang",
+- "-fdebug-compilation-dir",
+- "-Xclang",
+- ".",
+- ]
++ if (is_nacl) {
++ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
++ cflags += [
++ "-Xclang",
++ "-fdebug-compilation-dir",
++ "-Xclang",
++ ".",
++ ]
++ } else {
++ # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
++ # and -fcoverage-compilation-dir=.
++ cflags += [ "-ffile-compilation-dir=." ]
++ }
+ if (!is_win) {
+ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+ asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
+index 8c259c360a..642319b4f4 100644
+--- a/build/config/compiler/compiler.gni
++++ b/build/config/compiler/compiler.gni
+@@ -225,11 +225,8 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+- # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
+- # dependency to absolute path of source files.
+- !use_clang_coverage &&
+- (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+- is_chromeos || (is_apple && !enable_dsyms))
++ is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++ is_chromeos || (is_apple && !enable_dsyms)
+
+ # If the platform uses stripped absolute paths by default, then we don't expose
+ # it as a configuration option. If this is causing problems, please file a bug.
diff --git a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index a40ed9d5ac73..d109aeb5b95c 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -32,13 +32,13 @@ index 35f01d0a4..28f2e7475 100644
]
action_foreach("calculate_deb_dependencies") {
-@@ -315,7 +313,6 @@ group("installer_deps") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
":theme_files",
"//chrome",
"//chrome:packed_resources",
- "//chrome/browser/resources/media/mei_preload:component",
+ "//components/crash/core/app:chrome_crashpad_handler",
"//sandbox/linux:chrome_sandbox",
- "//third_party/crashpad/crashpad/handler:crashpad_handler",
]
diff --git a/sandbox/features.gni b/sandbox/features.gni
index db30ae6d6..9dc09bf53 100644
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 80823491366d..fadca44566bf 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=93.0.4577.82
+version=94.0.4606.54
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,13 +9,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=5d66214858fcba11a8f733d7a6fab61ed10e13e7df4ed37e63b66a0370fb2853
+checksum=033d9461e24251b790da17e64471eb22e3dfb09090744d3d0b7b4d0fbd75135d
nocross=yes
lib32disabled=yes
build_options="clang debug js_optimize vaapi pulseaudio sndio pipewire"
-build_options_default="clang js_optimize vaapi pulseaudio sndio pipewire"
+build_options_default="clang js_optimize vaapi pulseaudio pipewire"
desc_option_clang="Use clang to build"
desc_option_debug="Build with debug symbols"
desc_option_js_optimize="Optimize the JS used for Chromium's UI"
@@ -24,7 +24,7 @@ desc_option_pulseaudio="Enable support for PulseAudio"
desc_option_sndio="Enable support for sndio"
desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
-hostmakedepends="$(vopt_if clang "clang lld") python pkgconf perl gperf bison ninja nodejs hwids
+hostmakedepends="$(vopt_if clang "clang lld llvm12") python pkgconf perl gperf bison ninja nodejs hwids
libatomic-devel libevent-devel libglib-devel $(vopt_if js_optimize openjdk)"
makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
@@ -43,8 +43,6 @@ case "$XBPS_TARGET_MACHINE" in
ppc64*-musl) makedepends+=" libucontext-devel" ;;
esac
-build_options_default="clang js_optimize vaapi pulseaudio pipewire"
-
post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
for f in "${FILESDIR}"/musl-patches/*.patch; do
@@ -77,6 +75,10 @@ post_patch() {
# prevent annoying errors when regenerating gni
vsed -i 's,^update_readme$,#update_readme,' \
third_party/libvpx/generate_gni.sh
+
+ # allow system dependencies in "official builds"
+ vsed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+ tools/generate_shim_headers/generate_shim_headers.py
}
do_configure() {
local system="" conf=()
@@ -167,6 +169,7 @@ do_configure() {
"is_clang=$(vopt_if clang true false)"
"use_lld=$(vopt_if clang true false)"
'clang_use_chrome_plugins=false'
+ 'clang_base_path="/usr"'
"gold_path=\"${XBPS_CROSS_BASE}/usr/bin/ld.gold\""
'use_custom_libcxx=false'
@@ -215,7 +218,15 @@ do_configure() {
# Save space by removing DLOG and DCHECK messages (about 6% reduction).
# 'logging_like_official_build=true'
- 'fieldtrial_testing_like_official_build=true'
+ 'disable_fieldtrial_testing_config=true'
+
+ 'is_official_build=true'
+
+ # segfaults with llvm-12.0.1
+ 'is_cfi=false'
+ 'use_thin_lto=false'
+ 'use_cfi_icall=false'
+ 'chrome_pgo_phase=0'
)
# this does not work on ppc64 yet
@@ -231,19 +242,28 @@ do_configure() {
ppc64*) conf+=( 'target_cpu="ppc64"' ) ;;
esac
+ if [ "$build_option_clang" ]; then
+ export CC=clang
+ export CXX=clang++
+ export AR=llvm-ar
+ export NM=llvm-nm
+ fi
+
out/Release/gn gen out/Release --args="${conf[*]}"
}
do_build() {
if [ "$build_option_clang" ]; then
export CC=clang
export CXX=clang++
+ export AR=llvm-ar
+ export NM=llvm-nm
fi
- ninja -C out/Release ${makejobs} chrome chromedriver mksnapshot crashpad_handler
+ ninja -C out/Release ${makejobs} chrome chromedriver mksnapshot chrome_crashpad_handler
}
do_install() {
vinstall out/Release/chrome 755 usr/lib/${pkgname} ${pkgname}
- vinstall out/Release/crashpad_handler 755 usr/lib/${pkgname} crashpad_handler
+ vinstall out/Release/chrome_crashpad_handler 755 usr/lib/${pkgname} chrome_crashpad_handler
vinstall out/Release/chromedriver 755 usr/lib/${pkgname} chromedriver
vinstall out/Release/libEGL.so 755 usr/lib/${pkgname} libEGL.so
vinstall out/Release/libGLESv2.so 755 usr/lib/${pkgname} libGLESv2.so
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 94.0.4606.54.
2021-09-24 20:27 [PR PATCH] chromium: update to 94.0.4606.54 Duncaen
@ 2021-09-25 15:44 ` Duncaen
2021-09-25 15:49 ` Duncaen
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Duncaen @ 2021-09-25 15:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-94
https://github.com/void-linux/void-packages/pull/33094
chromium: update to 94.0.4606.54.
[ci skip]
- [x] x86_64-glibc
- [x] x86_64-musl
- [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/33094.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-94-33094.patch --]
[-- Type: text/x-diff, Size: 97588 bytes --]
From a82677cde8e4f9b6f0bab65d024310dd9f6a52ed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 24 Sep 2021 22:25:49 +0200
Subject: [PATCH] chromium: update to 94.0.4606.61.
---
.../files/musl-patches/no-mallinfo.patch | 13 +-
...e3dfcd0690df0e7b212fedcb95402f16935d.patch | 36 -
...14051210388bfcff605570d33f08cfa7bcaa.patch | 36 -
...c8b484c18c621d4b194635e41f171543f1df.patch | 42 -
...9ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch | 36 -
...5a1051551af26aaefc6fcd33502a51725396.patch | 36 -
srcpkgs/chromium/patches/9d080c0.patch | 196 +++
srcpkgs/chromium/patches/9d080c0.patch.args | 1 +
.../patches/chromium-90-ruy-include.patch | 24 -
.../patches/chromium-93-pdfium-include.patch | 117 --
.../chromium-94-CustomSpaces-include.patch | 24 +
.../patches/chromium-94-ffmpeg-roll.patch | 49 +
.../chromium-94-ffmpeg-roll.patch.args | 1 +
.../chromium/patches/chromium-webrtc-r0.patch | 33 -
.../linux-sandbox-fix-fstatat-crash.patch | 1384 -----------------
srcpkgs/chromium/patches/musl-stat.patch | 12 +
.../patches/remove-llvm13-warning-flags.patch | 13 -
.../patches/use-ffile-compilation-dir.patch | 66 +
.../use-ffile-compilation-dir.patch.args | 1 +
.../patches/xxx-ppc64le-support.patch | 4 +-
srcpkgs/chromium/template | 42 +-
21 files changed, 394 insertions(+), 1772 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
delete mode 100644 srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
delete mode 100644 srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
delete mode 100644 srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
delete mode 100644 srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
create mode 100644 srcpkgs/chromium/patches/9d080c0.patch
create mode 100644 srcpkgs/chromium/patches/9d080c0.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-90-ruy-include.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-webrtc-r0.patch
delete mode 100644 srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
create mode 100644 srcpkgs/chromium/patches/musl-stat.patch
delete mode 100644 srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
create mode 100644 srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
create mode 100644 srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 5fd3dc2b379c..2524cbb84ca9 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -53,12 +53,17 @@
result.max_rss_kb = res.ru_maxrss;
--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
+++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
-@@ -84,7 +84,7 @@
+@@ -86,11 +86,11 @@
}
-
+
size_t Process::GetMallocUsage() {
--#if defined(HAVE_MALLINFO)
-+#if defined(HAVE_MALLINFO) && defined(__GLIBC__)
+-#if defined(HAVE_MALLINFO2)
++#if defined(HAVE_MALLINFO2) && defined(__GLIBC__)
+ struct mallinfo2 mi;
+ mi = ::mallinfo2();
+ return mi.uordblks;
+-#elif defined(HAVE_MALLINFO)
++#elif defined(HAVE_MALLINFO) && defined(__GLIBC__)
struct mallinfo mi;
mi = ::mallinfo();
return mi.uordblks;
diff --git a/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch b/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
deleted file mode 100644
index c43da8dfd8ab..000000000000
--- a/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 17d0e3dfcd0690df0e7b212fedcb95402f16935d Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Fri, 23 Jul 2021 10:17:49 +0000
-Subject: [PATCH] IWYU: missing include for using std::vector in hash password
- manager.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build breakage:
-../../components/password_manager/core/browser/hash_password_manager.h:44:8: error: ‘vector’ in namespace ‘std’ does not name a template type
- 44 | std::vector<PasswordHashData> RetrieveAllPasswordHashes();
- | ^~~~~~
-
-Bug: 819294
-Change-Id: I8c8a4ec3972eedb87a312c5ec56adf4a21b1b2a2
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041046
-Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
-Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#904696}
----
- components/password_manager/core/browser/hash_password_manager.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/components/password_manager/core/browser/hash_password_manager.h b/components/password_manager/core/browser/hash_password_manager.h
-index c762c5a8c7713..85e656edcba11 100644
---- a/components/password_manager/core/browser/hash_password_manager.h
-+++ b/components/password_manager/core/browser/hash_password_manager.h
-@@ -6,6 +6,7 @@
- #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_HASH_PASSWORD_MANAGER_H_
-
- #include <string>
-+#include <vector>
-
- #include "base/callback.h"
- #include "base/callback_list.h"
diff --git a/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch b/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
deleted file mode 100644
index 8757eb5c36a9..000000000000
--- a/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2f5514051210388bfcff605570d33f08cfa7bcaa Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Wed, 21 Jul 2021 08:34:58 +0000
-Subject: [PATCH] IWYU: usage of unique_ptr requires including <memory> in
- bluetooth low energy scan filter.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build because of missing include:
-../../device/bluetooth/bluetooth_low_energy_scan_filter.h:57:15: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type
- 57 | static std::unique_ptr<BluetoothLowEnergyScanFilter> Create(
- | ^~~~~~~~~~
-
-Bug: 819294
-Change-Id: I347953a083f1bcdf744fd86e1a73954c6f86b32e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041155
-Reviewed-by: Reilly Grant <reillyg@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#903819}
----
- device/bluetooth/bluetooth_low_energy_scan_filter.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/device/bluetooth/bluetooth_low_energy_scan_filter.h b/device/bluetooth/bluetooth_low_energy_scan_filter.h
-index a0436c184a967..7ae606cca014e 100644
---- a/device/bluetooth/bluetooth_low_energy_scan_filter.h
-+++ b/device/bluetooth/bluetooth_low_energy_scan_filter.h
-@@ -7,6 +7,7 @@
-
- #include <stddef.h>
- #include <stdint.h>
-+#include <memory>
- #include <vector>
-
- #include "base/time/time.h"
diff --git a/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch b/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
deleted file mode 100644
index babfdb367660..000000000000
--- a/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 82e2c8b484c18c621d4b194635e41f171543f1df Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Tue, 27 Jul 2021 08:09:39 +0000
-Subject: [PATCH] IWYU: usage of std::strcpy requires including cstring, in
- extension dialog auto confirm.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build breakage with libstdc++:
- ../../extensions/browser/extension_dialog_auto_confirm.cc: In destructor ‘extensions::ScopedTestDialogAutoConfirm::~ScopedTestDialogAutoConfirm()’:
- ../../extensions/browser/extension_dialog_auto_confirm.cc:43:8: error: ‘strcpy’ is not a member of ‘std’
- 43 | std::strcpy(g_extension_dialog_justification, old_justification_.c_str());
- | ^~~~~~
- ../../extensions/browser/extension_dialog_auto_confirm.cc: In member function ‘void extensions::ScopedTestDialogAutoConfirm::set_justification(const string&)’:
- ../../extensions/browser/extension_dialog_auto_confirm.cc:66:8: error: ‘strcpy’ is not a member of ‘std’
- 66 | std::strcpy(g_extension_dialog_justification, justification.c_str());
- | ^~~~~~
-
-Bug: 957519
-Change-Id: I313c38f22cab599fb8f0e4a339e8143af5bda3ee
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041001
-Reviewed-by: David Bertoni <dbertoni@chromium.org>
-Reviewed-by: Ben Wells <benwells@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#905634}
----
- extensions/browser/extension_dialog_auto_confirm.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/extensions/browser/extension_dialog_auto_confirm.cc b/extensions/browser/extension_dialog_auto_confirm.cc
-index adb4ac3f92ec8..be8b161bc1658 100644
---- a/extensions/browser/extension_dialog_auto_confirm.cc
-+++ b/extensions/browser/extension_dialog_auto_confirm.cc
-@@ -4,6 +4,7 @@
-
- #include "extensions/browser/extension_dialog_auto_confirm.h"
-
-+#include <cstring>
- #include <utility>
-
- #include "base/check.h"
diff --git a/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch b/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
deleted file mode 100644
index e51f76a4b3c0..000000000000
--- a/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Wed, 21 Jul 2021 08:36:20 +0000
-Subject: [PATCH] IWYU: missing memory include for unique_ptr usage in
- class_property.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix GCC build breakage because of missing inclide:
-./../ui/base/class_property.h:120:58: error: ‘std::unique_ptr’ has not been declared
- 120 | T* SetProperty(const ClassProperty<T*>* property, std::unique_ptr<T> value);
- | ^~~~~~~~~~
-
-Bug: 819294
-Change-Id: I46b921876702b8d44674689bbb5acdc107db21e5
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041030
-Reviewed-by: Peter Boström <pbos@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#903820}
----
- ui/base/class_property.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ui/base/class_property.h b/ui/base/class_property.h
-index f7b2f559858b7..88b49386ae0ad 100644
---- a/ui/base/class_property.h
-+++ b/ui/base/class_property.h
-@@ -8,6 +8,7 @@
- #include <stdint.h>
-
- #include <map>
-+#include <memory>
- #include <set>
- #include <type_traits>
-
diff --git a/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch b/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
deleted file mode 100644
index bab64a814b2f..000000000000
--- a/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9c675a1051551af26aaefc6fcd33502a51725396 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Mon, 26 Jul 2021 17:14:51 +0000
-Subject: [PATCH] IWYU: missing include for std::vector usage in devtools
- embedded message dispatcher.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix GCC build breakage:
- ../../chrome/browser/devtools/devtools_embedder_message_dispatcher.h:116:36: error: ‘vector’ in namespace ‘std’ does not name a template type
- 116 | const std::vector<base::Value>& params) = 0;
- | ^~~~~~
-
-Bug: 819294
-Change-Id: I379bf14416c3bfd3c0cdac7bb2542b79781261ec
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041156
-Reviewed-by: Joe Mason <joenotcharles@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#905300}
----
- chrome/browser/devtools/devtools_embedder_message_dispatcher.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-index 12f8500b7811d..4007112f39410 100644
---- a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-+++ b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-@@ -8,6 +8,7 @@
- #include <map>
- #include <memory>
- #include <string>
-+#include <vector>
-
- #include "base/callback.h"
- #include "ui/gfx/geometry/insets.h"
diff --git a/srcpkgs/chromium/patches/9d080c0.patch b/srcpkgs/chromium/patches/9d080c0.patch
new file mode 100644
index 000000000000..885ab5a1b82a
--- /dev/null
+++ b/srcpkgs/chromium/patches/9d080c0.patch
@@ -0,0 +1,196 @@
+From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001
+From: Dylan Cutler <dylancutler@google.com>
+Date: Wed, 26 May 2021 16:39:52 +0000
+Subject: [PATCH] Reland "Replace 'blacklist' with 'ignorelist' in
+ ./tools/msan/."
+
+This is a reland of 3b6263f2eece1264b052dfdcbc03b851d5abfb48
+
+Relanding now that https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2897974 is merged
+
+Original change's description:
+> Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+>
+> Bug: 1097272, 1097268
+> Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+> Commit-Queue: Dylan Cutler <dylancutler@google.com>
+> Reviewed-by: Nico Weber <thakis@chromium.org>
+> Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+> Cr-Commit-Position: refs/heads/master@{#883035}
+
+Bug: 1097272
+Bug: 1097268
+Change-Id: I11a5bc8972680c95fb1dab95ed3b707ed76f4667
+Cq-Include-Trybots: luci.chromium.try:chromeos-amd64-generic-cfi-thin-lto-rel
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2911096
+Commit-Queue: Dylan Cutler <dylancutler@google.com>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#886773}
+---
+ build/config/sanitizers/BUILD.gn | 44 ++++++++++----------
+ build_overrides/build.gni | 14 +++----
+ tools/msan/{blacklist.txt => ignorelist.txt} | 0
+ 3 files changed, 29 insertions(+), 29 deletions(-)
+ rename tools/msan/{blacklist.txt => ignorelist.txt} (100%)
+
+diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn
+index aaaad023474d1..55b388a437439 100644
+--- a/build/config/sanitizers/BUILD.gn
++++ b/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+ if (is_asan) {
+ cflags += [ "-fsanitize=address" ]
+ if (is_win) {
+- if (!defined(asan_win_blacklist_path)) {
+- asan_win_blacklist_path =
++ if (!defined(asan_win_blocklist_path)) {
++ asan_win_blocklist_path =
+ rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+ }
+- cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
++ cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
+ }
+ }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+ cflags = []
+ if (is_cfi && current_toolchain == default_toolchain) {
+- if (!defined(cfi_blacklist_path)) {
+- cfi_blacklist_path =
++ if (!defined(cfi_ignorelist_path)) {
++ cfi_ignorelist_path =
+ rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+ }
+ cflags += [
+ "-fsanitize=cfi-vcall",
+- "-fsanitize-blacklist=$cfi_blacklist_path",
++ "-fsanitize-ignorelist=$cfi_ignorelist_path",
+ ]
+
+ if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+ if (is_msan) {
+ assert(is_linux || is_chromeos,
+ "msan only supported on linux x86_64/ChromeOS")
+- if (!defined(msan_blacklist_path)) {
+- msan_blacklist_path =
+- rebase_path("//tools/msan/blacklist.txt", root_build_dir)
++ if (!defined(msan_ignorelist_path)) {
++ msan_ignorelist_path =
++ rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=memory",
+ "-fsanitize-memory-track-origins=$msan_track_origins",
+- "-fsanitize-blacklist=$msan_blacklist_path",
++ "-fsanitize-ignorelist=$msan_ignorelist_path",
+ ]
+ }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+ if (is_tsan) {
+ assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+- if (!defined(tsan_blacklist_path)) {
+- tsan_blacklist_path =
++ if (!defined(tsan_ignorelist_path)) {
++ tsan_ignorelist_path =
+ rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=thread",
+- "-fsanitize-blacklist=$tsan_blacklist_path",
++ "-fsanitize-ignorelist=$tsan_ignorelist_path",
+ ]
+ }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+ cflags = []
+ if (is_ubsan) {
+- if (!defined(ubsan_blacklist_path)) {
+- ubsan_blacklist_path =
++ if (!defined(ubsan_ignorelist_path)) {
++ ubsan_ignorelist_path =
+ rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+ }
+ cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+ "-fsanitize=signed-integer-overflow",
+ "-fsanitize=unreachable",
+ "-fsanitize=vla-bound",
+- "-fsanitize-blacklist=$ubsan_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_ignorelist_path",
+ ]
+
+ # Chromecast ubsan builds fail to compile with these
+@@ -486,8 +486,8 @@ config("ubsan_no_recover") {
+
+ config("ubsan_security_flags") {
+ if (is_ubsan_security) {
+- if (!defined(ubsan_security_blacklist_path)) {
+- ubsan_security_blacklist_path =
++ if (!defined(ubsan_security_ignorelist_path)) {
++ ubsan_security_ignorelist_path =
+ rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+@@ -495,7 +495,7 @@ config("ubsan_security_flags") {
+ "-fsanitize=shift",
+ "-fsanitize=signed-integer-overflow",
+ "-fsanitize=vla-bound",
+- "-fsanitize-blacklist=$ubsan_security_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
+ ]
+ }
+ }
+@@ -508,13 +508,13 @@ config("ubsan_null_flags") {
+
+ config("ubsan_vptr_flags") {
+ if (is_ubsan_vptr) {
+- if (!defined(ubsan_vptr_blacklist_path)) {
+- ubsan_vptr_blacklist_path =
++ if (!defined(ubsan_vptr_ignorelist_path)) {
++ ubsan_vptr_ignorelist_path =
+ rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=vptr",
+- "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
+ ]
+ }
+ }
+diff --git a/build_overrides/build.gni b/build_overrides/build.gni
+index 82627b03653f1..f3e563ab701bf 100644
+--- a/build_overrides/build.gni
++++ b/build_overrides/build.gni
+@@ -42,15 +42,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_blacklist_path = "path/to/tsan/ignores.txt"
+-# msan_blacklist_path = "path/to/msan/blacklist.txt"
+-# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
+-# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
+-# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
+-# cfi_blacklist_path = "path/to/cfi/ignores.txt"
++# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
++# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
++# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
++# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
++# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
++# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
+
+ declare_args() {
+ # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
+diff --git a/tools/msan/blacklist.txt b/tools/msan/ignorelist.txt
+similarity index 100%
+rename from tools/msan/blacklist.txt
+rename to tools/msan/ignorelist.txt
diff --git a/srcpkgs/chromium/patches/9d080c0.patch.args b/srcpkgs/chromium/patches/9d080c0.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/9d080c0.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/chromium-90-ruy-include.patch b/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
deleted file mode 100644
index 81d5367807be..000000000000
--- a/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Thu, 4 Mar 2021 15:05:46 +0000
-Subject: [PATCH] IWYU: include limits for std::numeric_limits
-
----
- third_party/ruy/src/ruy/block_map.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/ruy/src/ruy/block_map.cc b/third_party/ruy/src/ruy/block_map.cc
-index 44e5039..a7a7559 100644
---- a/third_party/ruy/src/ruy/block_map.cc
-+++ b/third_party/ruy/src/ruy/block_map.cc
-@@ -17,6 +17,7 @@ limitations under the License.
-
- #include <algorithm>
- #include <cstdint>
-+#include <limits>
-
- #ifdef RUY_MAKEBLOCKMAP_DEBUG
- #include <cstdio>
---
-2.26.2
-
diff --git a/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch b/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
deleted file mode 100644
index 72f2abd3e7a6..000000000000
--- a/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 7a6289c5ace52cf88f0e19caa5f78b7c15d0e7a6 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.co.uk>
-Date: Wed, 21 Jul 2021 17:42:30 +0000
-Subject: [PATCH] fxcodec, fxge: fix missing includes with libstdc++
-
-These missing includes break the build with gcc/libstdc++, they were not
-a problem in practice with clang/libc++.
-
-Change-Id: I40013f97ba7ab06f32aa59f87b04aec06a19478c
-Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83210
-Commit-Queue: Lei Zhang <thestig@chromium.org>
-Reviewed-by: Lei Zhang <thestig@chromium.org>
----
-
-diff --git a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-index cea0679..036f250 100644
---- a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-+++ b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-@@ -7,6 +7,7 @@
- #include "core/fxcodec/jpeg/jpegmodule.h"
-
- #include <setjmp.h>
-+#include <string.h>
-
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-index c66985a..9c1122b 100644
---- a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-+++ b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxcodec/jpx/cjpx_decoder.h"
-
-+#include <string.h>
-+
- #include <algorithm>
- #include <limits>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-index 5369d52..d198852 100644
---- a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-+++ b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/cfx_cliprgn.h"
-
-+#include <string.h>
-+
- #include <utility>
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-index 6f9b420..0f1ffae 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_bitmapcomposer.h"
-
-+#include <string.h>
-+
- #include "core/fxge/cfx_cliprgn.h"
- #include "core/fxge/dib/cfx_dibitmap.h"
-
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-index f57c00e..45a0a18 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_bitmapstorer.h"
-
-+#include <string.h>
-+
- #include <utility>
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-index 4ec0ddb..a1de2fb 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_dibbase.h"
-
-+#include <string.h>
-+
- #include <algorithm>
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-index d7ccf6c..94e8acc 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-
-+#include <string.h>
-+
- #include <limits>
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-index e8362d7..c04c6dc 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_scanlinecompositor.h"
-
-+#include <string.h>
-+
- #include <algorithm>
-
- #include "core/fxge/dib/fx_dib.h"
diff --git a/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch b/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
new file mode 100644
index 000000000000..01757758c1e2
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
@@ -0,0 +1,24 @@
+From 4eeacdaa57b29a079fe09315eb22557c06aa522e Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 13 Aug 2021 12:57:42 +0000
+Subject: [PATCH] IWYU: add memory for std::unique_ptr in blink::CustomSpaces
+
+---
+ .../blink/renderer/platform/heap/v8_wrapper/custom_spaces.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
+index df0465a..640cb33 100644
+--- a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
++++ b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
+@@ -5,6 +5,7 @@
+ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
+ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
+
++#include <memory>
+ #include <vector>
+
+ #include "third_party/blink/renderer/platform/platform_export.h"
+--
+2.31.1
+
diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
new file mode 100644
index 000000000000..68f26364eda7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
@@ -0,0 +1,49 @@
+From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001
+From: "liberato@chromium.org" <liberato@chromium.org>
+Date: Fri, 6 Aug 2021 04:25:31 +0000
+Subject: [PATCH] FFmpeg M94 roll.
+
+Contains DEPS update + chromium-side fixes.
+
+Bug: 1227259
+Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889
+Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
+Commit-Queue: Frank Liberato <liberato@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#909174}
+---
+ media/ffmpeg/ffmpeg_common.h | 1 +
+ media/filters/ffmpeg_demuxer.cc | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
+index cede8ac5a7..97d6307e28 100644
+--- a/media/ffmpeg/ffmpeg_common.h
++++ b/media/ffmpeg/ffmpeg_common.h
+@@ -29,6 +29,7 @@ extern "C" {
+ #include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
++#include <libavutil/channel_layout.h>
+ #include <libavutil/imgutils.h>
+ #include <libavutil/log.h>
+ #include <libavutil/mastering_display_metadata.h>
+diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
+index ac4713b072..605001d935 100644
+--- a/media/filters/ffmpeg_demuxer.cc
++++ b/media/filters/ffmpeg_demuxer.cc
+@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
+
+ // Next try to use the first DTS value, for codecs where we know PTS == DTS
+ // (excludes all H26x codecs). The start time must be returned in PTS.
+- if (stream->first_dts != kNoFFmpegTimestamp &&
++ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
+ stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
+ stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
+ stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
+ const base::TimeDelta first_pts =
+- ConvertFromTimeBase(stream->time_base, stream->first_dts);
++ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
+ if (first_pts < start_time)
+ start_time = first_pts;
+ }
diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/chromium-webrtc-r0.patch b/srcpkgs/chromium/patches/chromium-webrtc-r0.patch
deleted file mode 100644
index 67574f6d540c..000000000000
--- a/srcpkgs/chromium/patches/chromium-webrtc-r0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream: Yes, https://webrtc-review.googlesource.com/9384
-Reason: Fixes musl builds of webrtc
-
-From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Fri, 13 Oct 2017 15:49:32 +0200
-Subject: [PATCH] IWYU: Include math.h for round(3).
-
-math.h was being implicitly included, which can break the build with
-alternative libc implementations.
-
-Bug: None
-Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
-Reviewed-on: https://webrtc-review.googlesource.com/9384
-Reviewed-by: Tommi <tommi@webrtc.org>
-Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
-Cr-Commit-Position: refs/heads/master@{#20292}
----
-
---- a/third_party/webrtc/p2p/base/port.cc
-+++ b/third_party/webrtc/p2p/base/port.cc
-@@ -10,6 +10,8 @@
-
- #include "p2p/base/port.h"
-
-+#include <math.h>
-+
- #include <algorithm>
- #include <vector>
-
---
-2.15.0.rc2
-
diff --git a/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch b/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
deleted file mode 100644
index 4a99f1de2874..000000000000
--- a/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
+++ /dev/null
@@ -1,1384 +0,0 @@
-From 4b438323d68840453b5ef826c3997568e2e0e8c7 Mon Sep 17 00:00:00 2001
-From: Matthew Denton <mpdenton@chromium.org>
-Date: Mon, 19 Jul 2021 14:03:13 +0000
-Subject: [PATCH] Reland "Reland "Linux sandbox syscall broker: use struct
- kernel_stat""
-
-This reverts commit ff277a52ece0b216617d770f201ed66955fe70b9.
-
-Reason for revert: reland
-
-The fix included in the reland is that fstatat64() needs to be
-allowed in the broker process's seccomp policy.
-
-This CL also includes some extra tests that the kernel_stat structures
-match the layout the kernel expects.
-
-Bug: 1164975, 1199431
-Test: trogdor Chromebook successfully boots and allows login.
-
-Original change's description:
-> Revert "Reland "Linux sandbox syscall broker: use struct kernel_stat""
->
-> This reverts commit cffbc4432af79f720ae3c75dff380b853701bd64.
->
-> Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1199431
->
-> Original change's description:
-> > Reland "Linux sandbox syscall broker: use struct kernel_stat"
-> >
-> > This reverts commit 23030dc650cdfa22631f25bef937905f27f06a2c.
-> >
-> > Original change's description:
-> > > Revert "Linux sandbox syscall broker: use struct kernel_stat"
-> > >
-> > > This reverts commit 784b0fcd8a3ca6bcd3acb9cfd624ec9cbbac2789.
-> > >
-> > > Reason for revert: Causing failure in
-> > > Step "sandbox_linux_unittests" failing on builder "Linux ChromiumOS MSan Tests"
-> > > See crbug.com/1198480
-> > >
-> > > Original change's description:
-> > > > Linux sandbox syscall broker: use struct kernel_stat
-> > > >
-> > > > The struct stat used in libc is different (in size and field ordering)
-> > > > from the structure assumed by the Linux kernel. So, when emulating
-> > > > system calls, we need to use the struct definition the kernel expects.
-> > > >
-> > > > This CL adds linux_stat.h that includes definitions of the different
-> > > > kernel structs.
-> > > >
-> > > > Change-Id: I53cad35c2251dff0f6b7ea77528cfa58ef3cab4a
-> > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2780876
-> > > > Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> > > > Reviewed-by: Robert Sesek <rsesek@chromium.org>
-> > > > Cr-Commit-Position: refs/heads/master@{#871767}
-> > >
-> > > Change-Id: Icbec38f2103c8424dec79ab1870b97c3e83f9361
-> > > No-Presubmit: true
-> > > No-Tree-Checks: true
-> > > No-Try: true
-> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2821812
-> > > Auto-Submit: Victor Vianna <victorvianna@google.com>
-> > > Owners-Override: Victor Vianna <victorvianna@google.com>
-> > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-> > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-> > > Cr-Commit-Position: refs/heads/master@{#871882}
-> >
-> > Change-Id: I1f39bb5242961474def594ff7dbea52009f2cee4
-> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2824115
-> > Auto-Submit: Matthew Denton <mpdenton@chromium.org>
-> > Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> > Reviewed-by: Robert Sesek <rsesek@chromium.org>
-> > Cr-Commit-Position: refs/heads/master@{#872812}
->
-> Fixed: 1199431
-> Change-Id: Iebfc0c48201bf22ff9c54d8d5c8a43d26a880098
-> No-Presubmit: true
-> No-Tree-Checks: true
-> No-Try: true
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2830459
-> Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
-> Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
-> Reviewed-by: Matthew Denton <mpdenton@chromium.org>
-> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
-> Owners-Override: Kinuko Yasuda <kinuko@chromium.org>
-> Cr-Commit-Position: refs/heads/master@{#873173}
-
-Change-Id: Ibe6a485070f33489aaa157b51b908c2d23d174d7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2848936
-Reviewed-by: Robert Sesek <rsesek@chromium.org>
-Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#902981}
----
- sandbox/linux/BUILD.gn | 1 +
- .../seccomp_broker_process_unittest.cc | 40 +++-
- sandbox/linux/seccomp-bpf-helpers/DEPS | 1 -
- ...scall_parameters_restrictions_unittests.cc | 4 -
- sandbox/linux/services/syscall_wrappers.cc | 50 ++++-
- sandbox/linux/services/syscall_wrappers.h | 15 ++
- .../services/syscall_wrappers_unittest.cc | 129 +++++++++++-
- sandbox/linux/syscall_broker/DEPS | 3 +-
- sandbox/linux/syscall_broker/broker_client.cc | 4 +-
- sandbox/linux/syscall_broker/broker_client.h | 4 +-
- sandbox/linux/syscall_broker/broker_host.cc | 23 ++-
- .../syscall_broker/broker_process_unittest.cc | 74 +++----
- .../remote_syscall_arg_handler_unittest.cc | 36 ++--
- .../syscall_broker/syscall_dispatcher.cc | 67 ++++---
- .../linux/syscall_broker/syscall_dispatcher.h | 27 ++-
- sandbox/linux/system_headers/linux_stat.h | 188 ++++++++++++++++++
- sandbox/linux/system_headers/linux_time.h | 26 +++
- sandbox/linux/tests/test_utils.cc | 15 ++
- sandbox/linux/tests/test_utils.h | 2 +
- .../policy/linux/bpf_broker_policy_linux.cc | 4 +-
- 20 files changed, 595 insertions(+), 118 deletions(-)
- create mode 100644 sandbox/linux/system_headers/linux_stat.h
-
-diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
-index 2f778dd0bcab2..ccbbc91716e71 100644
---- a/sandbox/linux/BUILD.gn
-+++ b/sandbox/linux/BUILD.gn
-@@ -443,6 +443,7 @@ source_set("sandbox_services_headers") {
- "system_headers/linux_ptrace.h",
- "system_headers/linux_seccomp.h",
- "system_headers/linux_signal.h",
-+ "system_headers/linux_stat.h",
- "system_headers/linux_syscalls.h",
- "system_headers/linux_time.h",
- "system_headers/linux_ucontext.h",
-diff --git a/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc b/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-index 9da9c68911428..8a941983b198d 100644
---- a/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-+++ b/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-@@ -34,6 +34,7 @@
- #include "sandbox/linux/syscall_broker/broker_file_permission.h"
- #include "sandbox/linux/syscall_broker/broker_process.h"
- #include "sandbox/linux/system_headers/linux_seccomp.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
- #include "sandbox/linux/tests/scoped_temporary_file.h"
- #include "sandbox/linux/tests/test_utils.h"
-@@ -202,6 +203,26 @@ namespace {
- // not accept this as a valid error number. E.g. bionic accepts up to 255, glibc
- // and musl up to 4096.
- const int kFakeErrnoSentinel = 254;
-+
-+void ConvertKernelStatToLibcStat(default_stat_struct& in_stat,
-+ struct stat& out_stat) {
-+ out_stat.st_dev = in_stat.st_dev;
-+ out_stat.st_ino = in_stat.st_ino;
-+ out_stat.st_mode = in_stat.st_mode;
-+ out_stat.st_nlink = in_stat.st_nlink;
-+ out_stat.st_uid = in_stat.st_uid;
-+ out_stat.st_gid = in_stat.st_gid;
-+ out_stat.st_rdev = in_stat.st_rdev;
-+ out_stat.st_size = in_stat.st_size;
-+ out_stat.st_blksize = in_stat.st_blksize;
-+ out_stat.st_blocks = in_stat.st_blocks;
-+ out_stat.st_atim.tv_sec = in_stat.st_atime_;
-+ out_stat.st_atim.tv_nsec = in_stat.st_atime_nsec_;
-+ out_stat.st_mtim.tv_sec = in_stat.st_mtime_;
-+ out_stat.st_mtim.tv_nsec = in_stat.st_mtime_nsec_;
-+ out_stat.st_ctim.tv_sec = in_stat.st_ctime_;
-+ out_stat.st_ctim.tv_nsec = in_stat.st_ctime_nsec_;
-+}
- } // namespace
-
- // There are a variety of ways to make syscalls in a sandboxed process. One is
-@@ -217,6 +238,10 @@ class Syscaller {
-
- virtual int Open(const char* filepath, int flags) = 0;
- virtual int Access(const char* filepath, int mode) = 0;
-+ // NOTE: we use struct stat instead of default_stat_struct, to make the libc
-+ // syscaller simpler. Copying from default_stat_struct (the structure returned
-+ // from a stat sycall) to struct stat (the structure exposed by a libc to its
-+ // users) is simpler than going in the opposite direction.
- virtual int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) = 0;
-@@ -243,8 +268,12 @@ class IPCSyscaller : public Syscaller {
- int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) override {
-- return broker_->GetBrokerClientSignalBased()->Stat(filepath, follow_links,
-- statbuf);
-+ default_stat_struct buf;
-+ int ret = broker_->GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ filepath, follow_links, &buf);
-+ if (ret >= 0)
-+ ConvertKernelStatToLibcStat(buf, *statbuf);
-+ return ret;
- }
-
- int Rename(const char* oldpath, const char* newpath) override {
-@@ -300,10 +329,13 @@ class DirectSyscaller : public Syscaller {
- int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) override {
-- int ret = follow_links ? syscall(__NR_stat, filepath, statbuf)
-- : syscall(__NR_lstat, filepath, statbuf);
-+ struct kernel_stat buf;
-+ int ret = syscall(__NR_newfstatat, AT_FDCWD, filepath, &buf,
-+ follow_links ? 0 : AT_SYMLINK_NOFOLLOW);
- if (ret < 0)
- return -errno;
-+
-+ ConvertKernelStatToLibcStat(buf, *statbuf);
- return ret;
- }
-
-diff --git a/sandbox/linux/seccomp-bpf-helpers/DEPS b/sandbox/linux/seccomp-bpf-helpers/DEPS
-index 4419fd1da34e8..95d1bb6cbbabf 100644
---- a/sandbox/linux/seccomp-bpf-helpers/DEPS
-+++ b/sandbox/linux/seccomp-bpf-helpers/DEPS
-@@ -3,5 +3,4 @@ include_rules = [
- "+sandbox/linux/seccomp-bpf",
- "+sandbox/linux/services",
- "+sandbox/linux/system_headers",
-- "+third_party/lss/linux_syscall_support.h",
- ]
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-index 903e702eab14b..76c393032c1fe 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-@@ -37,10 +37,6 @@
- #include "sandbox/linux/system_headers/linux_time.h"
- #include "sandbox/linux/tests/unit_tests.h"
-
--#if !defined(OS_ANDROID)
--#include "third_party/lss/linux_syscall_support.h" // for MAKE_PROCESS_CPUCLOCK
--#endif
--
- namespace sandbox {
-
- namespace {
-diff --git a/sandbox/linux/services/syscall_wrappers.cc b/sandbox/linux/services/syscall_wrappers.cc
-index fcfd2aa129d4b..3bec18a14e91e 100644
---- a/sandbox/linux/services/syscall_wrappers.cc
-+++ b/sandbox/linux/services/syscall_wrappers.cc
-@@ -4,6 +4,7 @@
-
- #include "sandbox/linux/services/syscall_wrappers.h"
-
-+#include <fcntl.h>
- #include <pthread.h>
- #include <sched.h>
- #include <setjmp.h>
-@@ -14,11 +15,13 @@
- #include <unistd.h>
- #include <cstring>
-
-+#include "base/check.h"
- #include "base/compiler_specific.h"
- #include "base/logging.h"
- #include "build/build_config.h"
- #include "sandbox/linux/system_headers/capability.h"
- #include "sandbox/linux/system_headers/linux_signal.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
-
- namespace sandbox {
-@@ -217,7 +220,7 @@ asm(
- #undef STR
- #undef XSTR
-
--#endif
-+#endif // defined(ARCH_CPU_X86_FAMILY)
-
- int sys_sigaction(int signum,
- const struct sigaction* act,
-@@ -241,7 +244,7 @@ int sys_sigaction(int signum,
- #error "Unsupported architecture."
- #endif
- }
--#endif
-+#endif // defined(ARCH_CPU_X86_FAMILY)
- }
-
- LinuxSigAction linux_oldact = {};
-@@ -259,6 +262,47 @@ int sys_sigaction(int signum,
- return result;
- }
-
--#endif // defined(MEMORY_SANITIZER)
-+#endif // !defined(OS_NACL_NONSFI)
-+
-+int sys_stat(const char* path, struct kernel_stat* stat_buf) {
-+ int res;
-+#if !defined(__NR_stat)
-+ res = syscall(__NR_newfstatat, AT_FDCWD, path, stat_buf, 0);
-+#else
-+ res = syscall(__NR_stat, path, stat_buf);
-+#endif
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+}
-+
-+int sys_lstat(const char* path, struct kernel_stat* stat_buf) {
-+ int res;
-+#if !defined(__NR_lstat)
-+ res = syscall(__NR_newfstatat, AT_FDCWD, path, stat_buf, AT_SYMLINK_NOFOLLOW);
-+#else
-+ res = syscall(__NR_lstat, path, stat_buf);
-+#endif
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+}
-+
-+int sys_fstatat64(int dirfd,
-+ const char* pathname,
-+ struct kernel_stat64* stat_buf,
-+ int flags) {
-+#if defined(__NR_fstatat64)
-+ int res = syscall(__NR_fstatat64, dirfd, pathname, stat_buf, flags);
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+#else // defined(__NR_fstatat64)
-+ // We should not reach here on 64-bit systems, as the *stat*64() are only
-+ // necessary on 32-bit.
-+ RAW_CHECK(false);
-+ return -ENOSYS;
-+#endif
-+}
-
- } // namespace sandbox
-diff --git a/sandbox/linux/services/syscall_wrappers.h b/sandbox/linux/services/syscall_wrappers.h
-index 1975bfbd88a6d..b55340e4a26b7 100644
---- a/sandbox/linux/services/syscall_wrappers.h
-+++ b/sandbox/linux/services/syscall_wrappers.h
-@@ -17,6 +17,8 @@ struct sock_fprog;
- struct rlimit64;
- struct cap_hdr;
- struct cap_data;
-+struct kernel_stat;
-+struct kernel_stat64;
-
- namespace sandbox {
-
-@@ -84,6 +86,19 @@ SANDBOX_EXPORT int sys_sigaction(int signum,
- const struct sigaction* act,
- struct sigaction* oldact);
-
-+// Some architectures do not have stat() and lstat() syscalls. In that case,
-+// these wrappers will use newfstatat(), which is available on all other
-+// architectures, with the same capabilities as stat() and lstat().
-+SANDBOX_EXPORT int sys_stat(const char* path, struct kernel_stat* stat_buf);
-+SANDBOX_EXPORT int sys_lstat(const char* path, struct kernel_stat* stat_buf);
-+
-+// Takes care of unpoisoning |stat_buf| for MSAN. Check-fails if fstatat64() is
-+// not a supported syscall on the current platform.
-+SANDBOX_EXPORT int sys_fstatat64(int dirfd,
-+ const char* pathname,
-+ struct kernel_stat64* stat_buf,
-+ int flags);
-+
- } // namespace sandbox
-
- #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
-diff --git a/sandbox/linux/services/syscall_wrappers_unittest.cc b/sandbox/linux/services/syscall_wrappers_unittest.cc
-index 32820f60a8cee..64b9cea80f319 100644
---- a/sandbox/linux/services/syscall_wrappers_unittest.cc
-+++ b/sandbox/linux/services/syscall_wrappers_unittest.cc
-@@ -5,15 +5,19 @@
- #include "sandbox/linux/services/syscall_wrappers.h"
-
- #include <stdint.h>
-+#include <string.h>
- #include <sys/syscall.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
--#include <cstring>
-
-+#include "base/logging.h"
-+#include "base/memory/page_size.h"
- #include "base/posix/eintr_wrapper.h"
- #include "build/build_config.h"
- #include "sandbox/linux/system_headers/linux_signal.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
-+#include "sandbox/linux/tests/scoped_temporary_file.h"
- #include "sandbox/linux/tests/test_utils.h"
- #include "sandbox/linux/tests/unit_tests.h"
- #include "testing/gtest/include/gtest/gtest.h"
-@@ -93,6 +97,129 @@ TEST(SyscallWrappers, LinuxSigSet) {
- linux_sigset);
- }
-
-+TEST(SyscallWrappers, Stat) {
-+ // Create a file to stat, with 12 bytes of data.
-+ ScopedTemporaryFile tmp_file;
-+ EXPECT_EQ(12, write(tmp_file.fd(), "blahblahblah", 12));
-+
-+ // To test we have the correct stat structures for each kernel/platform, we
-+ // will right-align them on a page, with a guard page after.
-+ char* two_pages = static_cast<char*>(TestUtils::MapPagesOrDie(2));
-+ TestUtils::MprotectLastPageOrDie(two_pages, 2);
-+ char* page1_end = two_pages + base::GetPageSize();
-+
-+ // First, check that calling stat with |stat_buf| pointing to the last byte on
-+ // a page causes EFAULT.
-+ int res = sys_stat(tmp_file.full_file_name(),
-+ reinterpret_cast<struct kernel_stat*>(page1_end - 1));
-+ ASSERT_EQ(res, -1);
-+ ASSERT_EQ(errno, EFAULT);
-+
-+ // Now, check that we have the correctly sized stat structure.
-+ struct kernel_stat* sb = reinterpret_cast<struct kernel_stat*>(
-+ page1_end - sizeof(struct kernel_stat));
-+ // Memset to c's so we can check the kernel zero'd the padding...
-+ memset(sb, 'c', sizeof(struct kernel_stat));
-+ res = sys_stat(tmp_file.full_file_name(), sb);
-+ ASSERT_EQ(res, 0);
-+
-+ // Following fields may never be consistent but should be non-zero.
-+ // Don't trust the platform to define fields with any particular sign.
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_dev));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_ino));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_mode));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_blksize));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_blocks));
-+
-+// We are the ones that made the file.
-+// Note: normally gid and uid overflow on backwards-compatible 32-bit systems
-+// and we end up with dummy uids and gids in place here.
-+#if defined(ARCH_CPU_64_BITS)
-+ EXPECT_EQ(geteuid(), sb->st_uid);
-+ EXPECT_EQ(getegid(), sb->st_gid);
-+#endif
-+
-+ // Wrote 12 bytes above which should fit in one block.
-+ EXPECT_EQ(12u, sb->st_size);
-+
-+ // Can't go backwards in time, 1500000000 was some time ago.
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_atime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_mtime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_ctime_));
-+
-+ // Checking the padding for good measure.
-+#if defined(__x86_64__)
-+ EXPECT_EQ(0u, sb->__pad0);
-+ EXPECT_EQ(0u, sb->__unused4[0]);
-+ EXPECT_EQ(0u, sb->__unused4[1]);
-+ EXPECT_EQ(0u, sb->__unused4[2]);
-+#elif defined(__aarch64__)
-+ EXPECT_EQ(0u, sb->__pad1);
-+ EXPECT_EQ(0, sb->__pad2);
-+ EXPECT_EQ(0u, sb->__unused4);
-+ EXPECT_EQ(0u, sb->__unused5);
-+#endif
-+}
-+
-+TEST(SyscallWrappers, LStat) {
-+ // Create a file to stat, with 12 bytes of data.
-+ ScopedTemporaryFile tmp_file;
-+ EXPECT_EQ(12, write(tmp_file.fd(), "blahblahblah", 12));
-+
-+ // Also create a symlink.
-+ std::string symlink_name;
-+ {
-+ ScopedTemporaryFile tmp_file2;
-+ symlink_name = tmp_file2.full_file_name();
-+ }
-+ int rc = symlink(tmp_file.full_file_name(), symlink_name.c_str());
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't symlink " << symlink_name << " to target "
-+ << tmp_file.full_file_name();
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat lstat_info;
-+ rc = sys_lstat(symlink_name.c_str(), &lstat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_lstat " << symlink_name;
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat stat_info;
-+ rc = sys_stat(symlink_name.c_str(), &stat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_stat " << symlink_name;
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat tmp_file_stat_info;
-+ rc = sys_stat(tmp_file.full_file_name(), &tmp_file_stat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_stat " << tmp_file.full_file_name();
-+ GTEST_FAIL();
-+ }
-+
-+ // lstat should produce information about a symlink.
-+ ASSERT_TRUE(S_ISLNK(lstat_info.st_mode));
-+
-+ // stat-ing symlink_name and tmp_file should produce the same inode.
-+ ASSERT_EQ(stat_info.st_ino, tmp_file_stat_info.st_ino);
-+
-+ // lstat-ing symlink_name should give a different inode than stat-ing
-+ // symlink_name.
-+ ASSERT_NE(stat_info.st_ino, lstat_info.st_ino);
-+}
-+
- } // namespace
-
- } // namespace sandbox
-diff --git a/sandbox/linux/syscall_broker/DEPS b/sandbox/linux/syscall_broker/DEPS
-index c477f7d36394b..149c463b06839 100644
---- a/sandbox/linux/syscall_broker/DEPS
-+++ b/sandbox/linux/syscall_broker/DEPS
-@@ -1,4 +1,5 @@
- include_rules = [
-- "+sandbox/linux/system_headers",
- "+sandbox/linux/bpf_dsl",
-+ "+sandbox/linux/services",
-+ "+sandbox/linux/system_headers",
- ]
-diff --git a/sandbox/linux/syscall_broker/broker_client.cc b/sandbox/linux/syscall_broker/broker_client.cc
-index 6b1b5be433899..e24f659fcf872 100644
---- a/sandbox/linux/syscall_broker/broker_client.cc
-+++ b/sandbox/linux/syscall_broker/broker_client.cc
-@@ -166,7 +166,7 @@ int BrokerClient::Rmdir(const char* path) const {
-
- int BrokerClient::Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const {
-+ struct kernel_stat* sb) const {
- if (!pathname || !sb)
- return -EFAULT;
-
-@@ -181,7 +181,7 @@ int BrokerClient::Stat(const char* pathname,
-
- int BrokerClient::Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const {
-+ struct kernel_stat64* sb) const {
- if (!pathname || !sb)
- return -EFAULT;
-
-diff --git a/sandbox/linux/syscall_broker/broker_client.h b/sandbox/linux/syscall_broker/broker_client.h
-index 05e14c83f2010..26ca78101c71c 100644
---- a/sandbox/linux/syscall_broker/broker_client.h
-+++ b/sandbox/linux/syscall_broker/broker_client.h
-@@ -61,10 +61,10 @@ class SANDBOX_EXPORT BrokerClient : public SyscallDispatcher {
- int Rmdir(const char* path) const override;
- int Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const override;
-+ struct kernel_stat* sb) const override;
- int Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const override;
-+ struct kernel_stat64* sb) const override;
- int Unlink(const char* unlink) const override;
-
- private:
-diff --git a/sandbox/linux/syscall_broker/broker_host.cc b/sandbox/linux/syscall_broker/broker_host.cc
-index 1cd03a18df809..1cdc01a888f41 100644
---- a/sandbox/linux/syscall_broker/broker_host.cc
-+++ b/sandbox/linux/syscall_broker/broker_host.cc
-@@ -20,9 +20,11 @@
- #include "base/files/scoped_file.h"
- #include "base/logging.h"
- #include "base/posix/eintr_wrapper.h"
-+#include "sandbox/linux/services/syscall_wrappers.h"
- #include "sandbox/linux/syscall_broker/broker_command.h"
- #include "sandbox/linux/syscall_broker/broker_permission_list.h"
- #include "sandbox/linux/syscall_broker/broker_simple_message.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
-
- namespace sandbox {
-@@ -193,10 +195,12 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(reply->AddIntToMessage(-permission_list.denied_errno()));
- return;
- }
-+
- if (command_type == COMMAND_STAT) {
-- struct stat sb;
-- int sts =
-- follow_links ? stat(file_to_access, &sb) : lstat(file_to_access, &sb);
-+ struct kernel_stat sb;
-+
-+ int sts = follow_links ? sandbox::sys_stat(file_to_access, &sb)
-+ : sandbox::sys_lstat(file_to_access, &sb);
- if (sts < 0) {
- RAW_CHECK(reply->AddIntToMessage(-errno));
- return;
-@@ -205,10 +209,12 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(
- reply->AddDataToMessage(reinterpret_cast<char*>(&sb), sizeof(sb)));
- } else {
-+#if defined(__NR_fstatat64)
- DCHECK(command_type == COMMAND_STAT64);
-- struct stat64 sb;
-- int sts = follow_links ? stat64(file_to_access, &sb)
-- : lstat64(file_to_access, &sb);
-+ struct kernel_stat64 sb;
-+
-+ int sts = sandbox::sys_fstatat64(AT_FDCWD, file_to_access, &sb,
-+ follow_links ? 0 : AT_SYMLINK_NOFOLLOW);
- if (sts < 0) {
- RAW_CHECK(reply->AddIntToMessage(-errno));
- return;
-@@ -216,6 +222,11 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(reply->AddIntToMessage(0));
- RAW_CHECK(
- reply->AddDataToMessage(reinterpret_cast<char*>(&sb), sizeof(sb)));
-+#else // defined(__NR_fstatat64)
-+ // We should not reach here on 64-bit systems, as the *stat*64() are only
-+ // necessary on 32-bit.
-+ RAW_CHECK(false);
-+#endif
- }
- }
-
-diff --git a/sandbox/linux/syscall_broker/broker_process_unittest.cc b/sandbox/linux/syscall_broker/broker_process_unittest.cc
-index 55ba6bccb29ec..c65f25a78a999 100644
---- a/sandbox/linux/syscall_broker/broker_process_unittest.cc
-+++ b/sandbox/linux/syscall_broker/broker_process_unittest.cc
-@@ -811,7 +811,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- const char* bad_leading_path5 = "/mbogo/fictitioux";
- const char* bad_leading_path6 = "/mbogo/fictitiousa";
-
-- struct stat sb;
-+ default_stat_struct sb;
-
- {
- // Actual file with permissions to see file but command not allowed.
-@@ -824,7 +824,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- tempfile_name, follow_links, &sb));
- }
-
-@@ -840,7 +840,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- nonesuch_name, follow_links, &sb));
- }
- {
-@@ -852,7 +852,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- tempfile_name, follow_links, &sb));
- }
- {
-@@ -864,38 +864,39 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- nonesuch_name, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ nonesuch_name, follow_links, &sb));
-
- // Gets denied all the way back to root since no create permission.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path3, follow_links, &sb));
-
- // Not fooled by substrings.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path3, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path4, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path5, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path6, follow_links, &sb));
- }
- {
-@@ -907,37 +908,41 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- nonesuch_name, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ nonesuch_name, follow_links, &sb));
-
- // Gets ENOENT all the way back to root since it has create permission.
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path1, follow_links, &sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path2, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path1, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path2, follow_links, &sb));
-
- // But can always get the root.
-- EXPECT_EQ(0, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path3, follow_links, &sb));
-+ EXPECT_EQ(0,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path3, follow_links, &sb));
-
- // Not fooled by substrings.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path3, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path4, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path5, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path6, follow_links, &sb));
- }
- {
-@@ -949,8 +954,9 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(0, open_broker.GetBrokerClientSignalBased()->Stat(
-- tempfile_name, follow_links, &sb));
-+ EXPECT_EQ(0,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ tempfile_name, follow_links, &sb));
-
- // Following fields may never be consistent but should be non-zero.
- // Don't trust the platform to define fields with any particular sign.
-@@ -968,9 +974,9 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- EXPECT_EQ(12, sb.st_size);
-
- // Can't go backwards in time, 1500000000 was some time ago.
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_atime));
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_mtime));
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_ctime));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_atime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_mtime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_ctime_));
- }
- }
-
-diff --git a/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc b/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-index fffa9bb7082ce..f517a9867c5de 100644
---- a/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-+++ b/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-@@ -16,6 +16,7 @@
- #include "base/memory/page_size.h"
- #include "base/posix/unix_domain_socket.h"
- #include "base/test/bind.h"
-+#include "sandbox/linux/tests/test_utils.h"
- #include "sandbox/linux/tests/unit_tests.h"
- #include "testing/gtest/include/gtest/gtest.h"
-
-@@ -52,19 +53,6 @@ void VerifyCorrectString(std::string str, size_t size) {
- }
- }
-
--void* MapPagesOrDie(size_t num_pages) {
-- void* addr = mmap(nullptr, num_pages * base::GetPageSize(),
-- PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-- PCHECK(addr);
-- return addr;
--}
--
--void MprotectLastPageOrDie(char* addr, size_t num_pages) {
-- size_t last_page_offset = (num_pages - 1) * base::GetPageSize();
-- PCHECK(mprotect(addr + last_page_offset, base::GetPageSize(), PROT_NONE) >=
-- 0);
--}
--
- pid_t ForkWaitingChild(base::OnceCallback<void(int)>
- after_parent_signals_callback = base::DoNothing(),
- base::ScopedFD* parent_sync_fd = nullptr) {
-@@ -105,13 +93,13 @@ void ReadTest(const ReadTestConfig& test_config) {
- size_t total_pages = (test_config.start_at + test_config.total_size +
- base::GetPageSize() - 1) /
- base::GetPageSize();
-- char* mmap_addr = static_cast<char*>(MapPagesOrDie(total_pages));
-+ char* mmap_addr = static_cast<char*>(TestUtils::MapPagesOrDie(total_pages));
- char* addr = mmap_addr + test_config.start_at;
- FillBufferWithPath(addr, test_config.total_size,
- test_config.include_null_byte);
-
- if (test_config.last_page_inaccessible)
-- MprotectLastPageOrDie(mmap_addr, total_pages);
-+ TestUtils::MprotectLastPageOrDie(mmap_addr, total_pages);
-
- pid_t pid = ForkWaitingChild();
- munmap(mmap_addr, base::GetPageSize() * total_pages);
-@@ -212,7 +200,7 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChunkPlus1EndingOnePastPage) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChildExited) {
-- void* addr = MapPagesOrDie(1);
-+ void* addr = TestUtils::MapPagesOrDie(1);
- FillBufferWithPath(static_cast<char*>(addr), strlen(kPathPart) + 1, true);
-
- base::ScopedFD parent_sync, child_sync;
-@@ -240,10 +228,10 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChildExited) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, BasicWrite) {
-- void* read_from = MapPagesOrDie(1);
-+ void* read_from = TestUtils::MapPagesOrDie(1);
- const size_t write_size = base::GetPageSize();
- FillBufferWithPath(static_cast<char*>(read_from), write_size, false);
-- char* write_to = static_cast<char*>(MapPagesOrDie(1));
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(1));
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-
-@@ -278,8 +266,8 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, BasicWrite) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteToInvalidAddress) {
-- char* write_to = static_cast<char*>(MapPagesOrDie(1));
-- MprotectLastPageOrDie(write_to, 1);
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(1));
-+ TestUtils::MprotectLastPageOrDie(write_to, 1);
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-
-@@ -295,11 +283,11 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteToInvalidAddress) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WritePartiallyToInvalidAddress) {
-- char* read_from = static_cast<char*>(MapPagesOrDie(2));
-+ char* read_from = static_cast<char*>(TestUtils::MapPagesOrDie(2));
- const size_t write_size = base::GetPageSize();
- FillBufferWithPath(static_cast<char*>(read_from), write_size, false);
-- char* write_to = static_cast<char*>(MapPagesOrDie(2));
-- MprotectLastPageOrDie(write_to, 2);
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(2));
-+ TestUtils::MprotectLastPageOrDie(write_to, 2);
- write_to += base::GetPageSize() / 2;
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-@@ -314,7 +302,7 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WritePartiallyToInvalidAddress) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteChildExited) {
-- char* addr = static_cast<char*>(MapPagesOrDie(1));
-+ char* addr = static_cast<char*>(TestUtils::MapPagesOrDie(1));
- FillBufferWithPath(static_cast<char*>(addr), strlen(kPathPart) + 1, true);
-
- base::ScopedFD parent_sync, child_sync;
-diff --git a/sandbox/linux/syscall_broker/syscall_dispatcher.cc b/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-index b9ee93c14ac59..8a42397ef872e 100644
---- a/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-+++ b/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-@@ -19,8 +19,18 @@ namespace syscall_broker {
- #define BROKER_UNPOISON_STRING(x)
- #endif
-
-+int SyscallDispatcher::DefaultStatForTesting(const char* pathname,
-+ bool follow_links,
-+ default_stat_struct* sb) {
-+#if defined(__NR_fstatat64)
-+ return Stat64(pathname, follow_links, sb);
-+#elif defined(__NR_newfstatat)
-+ return Stat(pathname, follow_links, sb);
-+#endif
-+}
-+
- int SyscallDispatcher::PerformStatat(const arch_seccomp_data& args,
-- bool arch64) {
-+ bool stat64) {
- if (static_cast<int>(args.args[0]) != AT_FDCWD)
- return -EPERM;
- // Only allow the AT_SYMLINK_NOFOLLOW flag which is used by some libc
-@@ -30,13 +40,29 @@ int SyscallDispatcher::PerformStatat(const arch_seccomp_data& args,
-
- const bool follow_links =
- !(static_cast<int>(args.args[3]) & AT_SYMLINK_NOFOLLOW);
-- if (arch64) {
-+ if (stat64) {
- return Stat64(reinterpret_cast<const char*>(args.args[1]), follow_links,
-- reinterpret_cast<struct stat64*>(args.args[2]));
-+ reinterpret_cast<struct kernel_stat64*>(args.args[2]));
- }
-
- return Stat(reinterpret_cast<const char*>(args.args[1]), follow_links,
-- reinterpret_cast<struct stat*>(args.args[2]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[2]));
-+}
-+
-+int SyscallDispatcher::PerformUnlinkat(const arch_seccomp_data& args) {
-+ if (static_cast<int>(args.args[0]) != AT_FDCWD)
-+ return -EPERM;
-+
-+ int flags = static_cast<int>(args.args[2]);
-+
-+ if (flags == AT_REMOVEDIR) {
-+ return Rmdir(reinterpret_cast<const char*>(args.args[1]));
-+ }
-+
-+ if (flags != 0)
-+ return -EPERM;
-+
-+ return Unlink(reinterpret_cast<const char*>(args.args[1]));
- }
-
- int SyscallDispatcher::DispatchSyscall(const arch_seccomp_data& args) {
-@@ -127,59 +153,42 @@ int SyscallDispatcher::DispatchSyscall(const arch_seccomp_data& args) {
- #if defined(__NR_stat)
- case __NR_stat:
- return Stat(reinterpret_cast<const char*>(args.args[0]), true,
-- reinterpret_cast<struct stat*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[1]));
- #endif
- #if defined(__NR_stat64)
- case __NR_stat64:
- return Stat64(reinterpret_cast<const char*>(args.args[0]), true,
-- reinterpret_cast<struct stat64*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat64*>(args.args[1]));
- #endif
- #if defined(__NR_lstat)
- case __NR_lstat:
- // See https://crbug.com/847096
- BROKER_UNPOISON_STRING(reinterpret_cast<const char*>(args.args[0]));
- return Stat(reinterpret_cast<const char*>(args.args[0]), false,
-- reinterpret_cast<struct stat*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[1]));
- #endif
- #if defined(__NR_lstat64)
- case __NR_lstat64:
- // See https://crbug.com/847096
- BROKER_UNPOISON_STRING(reinterpret_cast<const char*>(args.args[0]));
- return Stat64(reinterpret_cast<const char*>(args.args[0]), false,
-- reinterpret_cast<struct stat64*>(args.args[1]));
--#endif
--#if defined(__NR_fstatat)
-- case __NR_fstatat:
-- return PerformStatat(args, /*arch64=*/false);
-+ reinterpret_cast<struct kernel_stat64*>(args.args[1]));
- #endif
- #if defined(__NR_fstatat64)
- case __NR_fstatat64:
-- return PerformStatat(args, /*arch64=*/true);
-+ return PerformStatat(args, /*stat64=*/true);
- #endif
- #if defined(__NR_newfstatat)
- case __NR_newfstatat:
-- return PerformStatat(args, /*arch64=*/false);
-+ return PerformStatat(args, /*stat64=*/false);
- #endif
- #if defined(__NR_unlink)
- case __NR_unlink:
- return Unlink(reinterpret_cast<const char*>(args.args[0]));
- #endif
- #if defined(__NR_unlinkat)
-- case __NR_unlinkat: {
-- if (static_cast<int>(args.args[0]) != AT_FDCWD)
-- return -EPERM;
--
-- int flags = static_cast<int>(args.args[2]);
--
-- if (flags == AT_REMOVEDIR) {
-- return Rmdir(reinterpret_cast<const char*>(args.args[1]));
-- }
--
-- if (flags != 0)
-- return -EPERM;
--
-- return Unlink(reinterpret_cast<const char*>(args.args[1]));
-- }
-+ case __NR_unlinkat:
-+ return PerformUnlinkat(args);
- #endif // defined(__NR_unlinkat)
- default:
- RAW_CHECK(false);
-diff --git a/sandbox/linux/syscall_broker/syscall_dispatcher.h b/sandbox/linux/syscall_broker/syscall_dispatcher.h
-index d8b8874ad9ce4..1d6653caf3bd2 100644
---- a/sandbox/linux/syscall_broker/syscall_dispatcher.h
-+++ b/sandbox/linux/syscall_broker/syscall_dispatcher.h
-@@ -9,13 +9,15 @@
- #include <cstddef>
-
- #include "sandbox/linux/system_headers/linux_seccomp.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
-+#include "sandbox/sandbox_export.h"
-
- namespace sandbox {
- namespace syscall_broker {
-
- // An abstract class that defines all the system calls we perform for the
- // sandboxed process.
--class SyscallDispatcher {
-+class SANDBOX_EXPORT SyscallDispatcher {
- public:
- // Emulates access()/faccessat().
- // X_OK will always return an error in practice since the broker process
-@@ -40,19 +42,34 @@ class SyscallDispatcher {
- virtual int Rmdir(const char* path) const = 0;
-
- // Emulates stat()/stat64()/lstat()/lstat64()/fstatat()/newfstatat().
-+ // Stat64 is only available on 32-bit systems.
- virtual int Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const = 0;
-+ struct kernel_stat* sb) const = 0;
- virtual int Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const = 0;
-+ struct kernel_stat64* sb) const = 0;
-
- // Emulates unlink()/unlinkat().
- virtual int Unlink(const char* unlink) const = 0;
-
-+ // Different architectures use a different syscall from the stat family by
-+ // default in glibc. E.g. 32-bit systems use *stat*64() and fill out struct
-+ // kernel_stat64, whereas 64-bit systems use *stat*() and fill out struct
-+ // kernel_stat. Some tests want to call the SyscallDispatcher directly, and
-+ // should be using the default stat in order to test against glibc.
-+ int DefaultStatForTesting(const char* pathname,
-+ bool follow_links,
-+ default_stat_struct* sb);
-+
- // Validates the args passed to a *statat*() syscall and performs the syscall
-- // using Stat() or Stat64().
-- int PerformStatat(const arch_seccomp_data& args, bool arch64);
-+ // using Stat(), or on 32-bit systems it uses Stat64() for the *statat64()
-+ // syscalls.
-+ int PerformStatat(const arch_seccomp_data& args, bool stat64);
-+
-+ // Validates the args passed to an unlinkat() syscall and performs the syscall
-+ // using either Unlink() or Rmdir().
-+ int PerformUnlinkat(const arch_seccomp_data& args);
-
- // Reads the syscall number and arguments, imposes some policy (e.g. the *at()
- // system calls must only allow AT_FDCWD as the first argument), and
-diff --git a/sandbox/linux/system_headers/linux_stat.h b/sandbox/linux/system_headers/linux_stat.h
-new file mode 100644
-index 0000000000000..35788eb22a4e5
---- /dev/null
-+++ b/sandbox/linux/system_headers/linux_stat.h
-@@ -0,0 +1,188 @@
-+// Copyright 2021 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-+
-+#include <stdint.h>
-+
-+#include "build/build_config.h"
-+#include "sandbox/linux/system_headers/linux_syscalls.h"
-+
-+#if defined(ARCH_CPU_MIPS_FAMILY)
-+#if defined(ARCH_CPU_64_BITS)
-+struct kernel_stat {
-+#else
-+struct kernel_stat64 {
-+#endif
-+ unsigned st_dev;
-+ unsigned __pad0[3];
-+ unsigned long long st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned st_rdev;
-+ unsigned __pad1[3];
-+ long long st_size;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned st_blksize;
-+ unsigned __pad2;
-+ unsigned long long st_blocks;
-+};
-+#else
-+struct kernel_stat64 {
-+ unsigned long long st_dev;
-+ unsigned char __pad0[4];
-+ unsigned __st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned long long st_rdev;
-+ unsigned char __pad3[4];
-+ long long st_size;
-+ unsigned st_blksize;
-+ unsigned long long st_blocks;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned long long st_ino;
-+};
-+#endif
-+
-+#if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
-+struct kernel_stat {
-+ /* The kernel headers suggest that st_dev and st_rdev should be 32bit
-+ * quantities encoding 12bit major and 20bit minor numbers in an interleaved
-+ * format. In reality, we do not see useful data in the top bits. So,
-+ * we'll leave the padding in here, until we find a better solution.
-+ */
-+ unsigned short st_dev;
-+ short pad1;
-+ unsigned st_ino;
-+ unsigned short st_mode;
-+ unsigned short st_nlink;
-+ unsigned short st_uid;
-+ unsigned short st_gid;
-+ unsigned short st_rdev;
-+ short pad2;
-+ unsigned st_size;
-+ unsigned st_blksize;
-+ unsigned st_blocks;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned __unused4;
-+ unsigned __unused5;
-+};
-+#elif defined(__x86_64__)
-+struct kernel_stat {
-+ uint64_t st_dev;
-+ uint64_t st_ino;
-+ uint64_t st_nlink;
-+ unsigned st_mode;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned __pad0;
-+ uint64_t st_rdev;
-+ int64_t st_size;
-+ int64_t st_blksize;
-+ int64_t st_blocks;
-+ uint64_t st_atime_;
-+ uint64_t st_atime_nsec_;
-+ uint64_t st_mtime_;
-+ uint64_t st_mtime_nsec_;
-+ uint64_t st_ctime_;
-+ uint64_t st_ctime_nsec_;
-+ int64_t __unused4[3];
-+};
-+#elif (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+struct kernel_stat {
-+ unsigned st_dev;
-+ int st_pad1[3];
-+ unsigned st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned st_rdev;
-+ int st_pad2[2];
-+ long st_size;
-+ int st_pad3;
-+ long st_atime_;
-+ long st_atime_nsec_;
-+ long st_mtime_;
-+ long st_mtime_nsec_;
-+ long st_ctime_;
-+ long st_ctime_nsec_;
-+ int st_blksize;
-+ int st_blocks;
-+ int st_pad4[14];
-+};
-+#elif defined(__aarch64__)
-+struct kernel_stat {
-+ unsigned long st_dev;
-+ unsigned long st_ino;
-+ unsigned int st_mode;
-+ unsigned int st_nlink;
-+ unsigned int st_uid;
-+ unsigned int st_gid;
-+ unsigned long st_rdev;
-+ unsigned long __pad1;
-+ long st_size;
-+ int st_blksize;
-+ int __pad2;
-+ long st_blocks;
-+ long st_atime_;
-+ unsigned long st_atime_nsec_;
-+ long st_mtime_;
-+ unsigned long st_mtime_nsec_;
-+ long st_ctime_;
-+ unsigned long st_ctime_nsec_;
-+ unsigned int __unused4;
-+ unsigned int __unused5;
-+};
-+#endif
-+
-+// On 32-bit systems, we default to the 64-bit stat struct like libc
-+// implementations do. Otherwise we default to the normal stat struct which is
-+// already 64-bit.
-+// These defines make it easy to call the right syscall to fill out a 64-bit
-+// stat struct, which is the default in libc implementations but requires
-+// different syscall names on 32 and 64-bit platforms.
-+#if defined(__NR_fstatat64)
-+
-+namespace sandbox {
-+using default_stat_struct = struct kernel_stat64;
-+} // namespace sandbox
-+
-+#define __NR_fstatat_default __NR_fstatat64
-+#define __NR_fstat_default __NR_fstat64
-+
-+#elif defined(__NR_newfstatat)
-+
-+namespace sandbox {
-+using default_stat_struct = struct kernel_stat;
-+} // namespace sandbox
-+
-+#define __NR_fstatat_default __NR_newfstatat
-+#define __NR_fstat_default __NR_fstat
-+
-+#else
-+#error "one of fstatat64 and newfstatat must be defined"
-+#endif
-+
-+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-diff --git a/sandbox/linux/system_headers/linux_time.h b/sandbox/linux/system_headers/linux_time.h
-index 780f24dddd9fa..f18c806611f83 100644
---- a/sandbox/linux/system_headers/linux_time.h
-+++ b/sandbox/linux/system_headers/linux_time.h
-@@ -11,6 +11,32 @@
- #define CPUCLOCK_CLOCK_MASK 3
- #endif
-
-+#if !defined(CPUCLOCK_PROF)
-+#define CPUCLOCK_PROF 0
-+#endif
-+
-+#if !defined(CPUCLOCK_VIRT)
-+#define CPUCLOCK_VIRT 1
-+#endif
-+
-+#if !defined(CPUCLOCK_SCHED)
-+#define CPUCLOCK_SCHED 2
-+#endif
-+
-+#if !defined(CPUCLOCK_PERTHREAD_MASK)
-+#define CPUCLOCK_PERTHREAD_MASK 4
-+#endif
-+
-+#if !defined(MAKE_PROCESS_CPUCLOCK)
-+#define MAKE_PROCESS_CPUCLOCK(pid, clock) \
-+ ((int)(~(unsigned)(pid) << 3) | (int)(clock))
-+#endif
-+
-+#if !defined(MAKE_THREAD_CPUCLOCK)
-+#define MAKE_THREAD_CPUCLOCK(tid, clock) \
-+ ((int)(~(unsigned)(tid) << 3) | (int)((clock) | CPUCLOCK_PERTHREAD_MASK))
-+#endif
-+
- #if !defined(CLOCKFD)
- #define CLOCKFD 3
- #endif
-diff --git a/sandbox/linux/tests/test_utils.cc b/sandbox/linux/tests/test_utils.cc
-index 847c20b20c5d2..cf6041a4b476a 100644
---- a/sandbox/linux/tests/test_utils.cc
-+++ b/sandbox/linux/tests/test_utils.cc
-@@ -5,12 +5,14 @@
- #include "sandbox/linux/tests/test_utils.h"
-
- #include <errno.h>
-+#include <sys/mman.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
-
- #include "base/check_op.h"
-+#include "base/memory/page_size.h"
- #include "base/posix/eintr_wrapper.h"
-
- namespace sandbox {
-@@ -39,4 +41,17 @@ void TestUtils::HandlePostForkReturn(pid_t pid) {
- }
- }
-
-+void* TestUtils::MapPagesOrDie(size_t num_pages) {
-+ void* addr = mmap(nullptr, num_pages * base::GetPageSize(),
-+ PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-+ PCHECK(addr);
-+ return addr;
-+}
-+
-+void TestUtils::MprotectLastPageOrDie(char* addr, size_t num_pages) {
-+ size_t last_page_offset = (num_pages - 1) * base::GetPageSize();
-+ PCHECK(mprotect(addr + last_page_offset, base::GetPageSize(), PROT_NONE) >=
-+ 0);
-+}
-+
- } // namespace sandbox
-diff --git a/sandbox/linux/tests/test_utils.h b/sandbox/linux/tests/test_utils.h
-index 7cf9749fe4f1f..43b028b1e34ef 100644
---- a/sandbox/linux/tests/test_utils.h
-+++ b/sandbox/linux/tests/test_utils.h
-@@ -19,6 +19,8 @@ class TestUtils {
- // makes sure that if fork() succeeded the child exits
- // and the parent waits for it.
- static void HandlePostForkReturn(pid_t pid);
-+ static void* MapPagesOrDie(size_t num_pages);
-+ static void MprotectLastPageOrDie(char* addr, size_t num_pages);
-
- private:
- DISALLOW_IMPLICIT_CONSTRUCTORS(TestUtils);
-diff --git a/sandbox/policy/linux/bpf_broker_policy_linux.cc b/sandbox/policy/linux/bpf_broker_policy_linux.cc
-index 2963bb9ca8612..6dc8c0581b43c 100644
---- a/sandbox/policy/linux/bpf_broker_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_broker_policy_linux.cc
-@@ -93,8 +93,8 @@ ResultExpr BrokerProcessPolicy::EvaluateSyscall(int sysno) const {
- return Allow();
- break;
- #endif
--#if defined(__NR_fstatat)
-- case __NR_fstatat:
-+#if defined(__NR_fstatat64)
-+ case __NR_fstatat64:
- if (allowed_command_set_.test(syscall_broker::COMMAND_STAT))
- return Allow();
- break;
diff --git a/srcpkgs/chromium/patches/musl-stat.patch b/srcpkgs/chromium/patches/musl-stat.patch
new file mode 100644
index 000000000000..427be1a3f4c2
--- /dev/null
+++ b/srcpkgs/chromium/patches/musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/base/files/file.h.orig
++++ b/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+- defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++ defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++ (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch b/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
deleted file mode 100644
index d1db7e420154..000000000000
--- a/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/build/config/compiler/BUILD.gn.orig
-+++ b/build/config/compiler/BUILD.gn
-@@ -1620,10 +1620,6 @@
-
- # TODO(https://crbug.com/1050281): Clean up, enable.
- "-Wno-non-c-typedef-for-linkage",
--
-- # TODO(https://crbug.com/1203071): Clean up and enable.
-- "-Wno-unused-but-set-parameter",
-- "-Wno-unused-but-set-variable",
- ]
-
- cflags_c += [
diff --git a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..f0ce44c0a487
--- /dev/null
+++ b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
@@ -0,0 +1,66 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+---
+ build/config/compiler/BUILD.gn | 18 ++++++++++++------
+ build/config/compiler/compiler.gni | 7 ++-----
+ 2 files changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index ede07d111c..6db16c1cdd 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1216,12 +1216,19 @@ config("compiler_deterministic") {
+ # different build directory like "out/feature_a" and "out/feature_b" if
+ # we build same files with same compile flag.
+ # Other paths are already given in relative, no need to normalize them.
+- cflags += [
+- "-Xclang",
+- "-fdebug-compilation-dir",
+- "-Xclang",
+- ".",
+- ]
++ if (is_nacl) {
++ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
++ cflags += [
++ "-Xclang",
++ "-fdebug-compilation-dir",
++ "-Xclang",
++ ".",
++ ]
++ } else {
++ # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
++ # and -fcoverage-compilation-dir=.
++ cflags += [ "-ffile-compilation-dir=." ]
++ }
+ if (!is_win) {
+ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+ asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
+index 8c259c360a..642319b4f4 100644
+--- a/build/config/compiler/compiler.gni
++++ b/build/config/compiler/compiler.gni
+@@ -225,11 +225,8 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+- # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
+- # dependency to absolute path of source files.
+- !use_clang_coverage &&
+- (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+- is_chromeos || (is_apple && !enable_dsyms))
++ is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++ is_chromeos || (is_apple && !enable_dsyms)
+
+ # If the platform uses stripped absolute paths by default, then we don't expose
+ # it as a configuration option. If this is causing problems, please file a bug.
diff --git a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index a40ed9d5ac73..d109aeb5b95c 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -32,13 +32,13 @@ index 35f01d0a4..28f2e7475 100644
]
action_foreach("calculate_deb_dependencies") {
-@@ -315,7 +313,6 @@ group("installer_deps") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
":theme_files",
"//chrome",
"//chrome:packed_resources",
- "//chrome/browser/resources/media/mei_preload:component",
+ "//components/crash/core/app:chrome_crashpad_handler",
"//sandbox/linux:chrome_sandbox",
- "//third_party/crashpad/crashpad/handler:crashpad_handler",
]
diff --git a/sandbox/features.gni b/sandbox/features.gni
index db30ae6d6..9dc09bf53 100644
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 80823491366d..4bc1ccd32105 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=93.0.4577.82
+version=94.0.4606.61
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,13 +9,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=5d66214858fcba11a8f733d7a6fab61ed10e13e7df4ed37e63b66a0370fb2853
+checksum=033d9461e24251b790da17e64471eb22e3dfb09090744d3d0b7b4d0fbd75135d
nocross=yes
lib32disabled=yes
build_options="clang debug js_optimize vaapi pulseaudio sndio pipewire"
-build_options_default="clang js_optimize vaapi pulseaudio sndio pipewire"
+build_options_default="clang js_optimize vaapi pulseaudio pipewire"
desc_option_clang="Use clang to build"
desc_option_debug="Build with debug symbols"
desc_option_js_optimize="Optimize the JS used for Chromium's UI"
@@ -24,7 +24,7 @@ desc_option_pulseaudio="Enable support for PulseAudio"
desc_option_sndio="Enable support for sndio"
desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
-hostmakedepends="$(vopt_if clang "clang lld") python pkgconf perl gperf bison ninja nodejs hwids
+hostmakedepends="$(vopt_if clang "clang lld llvm12") python pkgconf perl gperf bison ninja nodejs hwids
libatomic-devel libevent-devel libglib-devel $(vopt_if js_optimize openjdk)"
makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
@@ -43,8 +43,6 @@ case "$XBPS_TARGET_MACHINE" in
ppc64*-musl) makedepends+=" libucontext-devel" ;;
esac
-build_options_default="clang js_optimize vaapi pulseaudio pipewire"
-
post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
for f in "${FILESDIR}"/musl-patches/*.patch; do
@@ -77,6 +75,10 @@ post_patch() {
# prevent annoying errors when regenerating gni
vsed -i 's,^update_readme$,#update_readme,' \
third_party/libvpx/generate_gni.sh
+
+ # allow system dependencies in "official builds"
+ vsed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+ tools/generate_shim_headers/generate_shim_headers.py
}
do_configure() {
local system="" conf=()
@@ -167,6 +169,7 @@ do_configure() {
"is_clang=$(vopt_if clang true false)"
"use_lld=$(vopt_if clang true false)"
'clang_use_chrome_plugins=false'
+ 'clang_base_path="/usr"'
"gold_path=\"${XBPS_CROSS_BASE}/usr/bin/ld.gold\""
'use_custom_libcxx=false'
@@ -215,7 +218,15 @@ do_configure() {
# Save space by removing DLOG and DCHECK messages (about 6% reduction).
# 'logging_like_official_build=true'
- 'fieldtrial_testing_like_official_build=true'
+ 'disable_fieldtrial_testing_config=true'
+
+ 'is_official_build=true'
+
+ # segfaults with llvm-12.0.1
+ 'is_cfi=false'
+ 'use_thin_lto=false'
+ 'use_cfi_icall=false'
+ 'chrome_pgo_phase=0'
)
# this does not work on ppc64 yet
@@ -231,19 +242,32 @@ do_configure() {
ppc64*) conf+=( 'target_cpu="ppc64"' ) ;;
esac
+ if [ "$build_option_clang" ]; then
+ export CC=clang
+ export CXX=clang++
+ export AR=llvm-ar
+ export NM=llvm-nm
+ export CFLAGS="-Wno-unknown-warning-option"
+ export CXXFLAGS="-Wno-unknown-warning-option"
+ fi
+
out/Release/gn gen out/Release --args="${conf[*]}"
}
do_build() {
if [ "$build_option_clang" ]; then
export CC=clang
export CXX=clang++
+ export AR=llvm-ar
+ export NM=llvm-nm
+ export CFLAGS="-Wno-unknown-warning-option"
+ export CXXFLAGS="-Wno-unknown-warning-option"
fi
- ninja -C out/Release ${makejobs} chrome chromedriver mksnapshot crashpad_handler
+ ninja -C out/Release ${makejobs} chrome chromedriver mksnapshot chrome_crashpad_handler
}
do_install() {
vinstall out/Release/chrome 755 usr/lib/${pkgname} ${pkgname}
- vinstall out/Release/crashpad_handler 755 usr/lib/${pkgname} crashpad_handler
+ vinstall out/Release/chrome_crashpad_handler 755 usr/lib/${pkgname} chrome_crashpad_handler
vinstall out/Release/chromedriver 755 usr/lib/${pkgname} chromedriver
vinstall out/Release/libEGL.so 755 usr/lib/${pkgname} libEGL.so
vinstall out/Release/libGLESv2.so 755 usr/lib/${pkgname} libGLESv2.so
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 94.0.4606.54.
2021-09-24 20:27 [PR PATCH] chromium: update to 94.0.4606.54 Duncaen
2021-09-25 15:44 ` [PR PATCH] [Updated] " Duncaen
@ 2021-09-25 15:49 ` Duncaen
2021-09-25 16:09 ` Duncaen
2021-09-25 16:10 ` [PR PATCH] [Merged]: " Duncaen
3 siblings, 0 replies; 5+ messages in thread
From: Duncaen @ 2021-09-25 15:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-94
https://github.com/void-linux/void-packages/pull/33094
chromium: update to 94.0.4606.54.
[ci skip]
- [x] x86_64-glibc
- [x] x86_64-musl
- [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/33094.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-94-33094.patch --]
[-- Type: text/x-diff, Size: 97588 bytes --]
From 2ef8b296cd0985986977c8cc8052812543cd668b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 24 Sep 2021 22:25:49 +0200
Subject: [PATCH] chromium: update to 94.0.4606.61.
---
.../files/musl-patches/no-mallinfo.patch | 13 +-
...e3dfcd0690df0e7b212fedcb95402f16935d.patch | 36 -
...14051210388bfcff605570d33f08cfa7bcaa.patch | 36 -
...c8b484c18c621d4b194635e41f171543f1df.patch | 42 -
...9ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch | 36 -
...5a1051551af26aaefc6fcd33502a51725396.patch | 36 -
srcpkgs/chromium/patches/9d080c0.patch | 196 +++
srcpkgs/chromium/patches/9d080c0.patch.args | 1 +
.../patches/chromium-90-ruy-include.patch | 24 -
.../patches/chromium-93-pdfium-include.patch | 117 --
.../chromium-94-CustomSpaces-include.patch | 24 +
.../patches/chromium-94-ffmpeg-roll.patch | 49 +
.../chromium-94-ffmpeg-roll.patch.args | 1 +
.../chromium/patches/chromium-webrtc-r0.patch | 33 -
.../linux-sandbox-fix-fstatat-crash.patch | 1384 -----------------
srcpkgs/chromium/patches/musl-stat.patch | 12 +
.../patches/remove-llvm13-warning-flags.patch | 13 -
.../patches/use-ffile-compilation-dir.patch | 66 +
.../use-ffile-compilation-dir.patch.args | 1 +
.../patches/xxx-ppc64le-support.patch | 4 +-
srcpkgs/chromium/template | 42 +-
21 files changed, 394 insertions(+), 1772 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
delete mode 100644 srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
delete mode 100644 srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
delete mode 100644 srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
delete mode 100644 srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
create mode 100644 srcpkgs/chromium/patches/9d080c0.patch
create mode 100644 srcpkgs/chromium/patches/9d080c0.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-90-ruy-include.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-webrtc-r0.patch
delete mode 100644 srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
create mode 100644 srcpkgs/chromium/patches/musl-stat.patch
delete mode 100644 srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
create mode 100644 srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
create mode 100644 srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 5fd3dc2b379c..2524cbb84ca9 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -53,12 +53,17 @@
result.max_rss_kb = res.ru_maxrss;
--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
+++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
-@@ -84,7 +84,7 @@
+@@ -86,11 +86,11 @@
}
-
+
size_t Process::GetMallocUsage() {
--#if defined(HAVE_MALLINFO)
-+#if defined(HAVE_MALLINFO) && defined(__GLIBC__)
+-#if defined(HAVE_MALLINFO2)
++#if defined(HAVE_MALLINFO2) && defined(__GLIBC__)
+ struct mallinfo2 mi;
+ mi = ::mallinfo2();
+ return mi.uordblks;
+-#elif defined(HAVE_MALLINFO)
++#elif defined(HAVE_MALLINFO) && defined(__GLIBC__)
struct mallinfo mi;
mi = ::mallinfo();
return mi.uordblks;
diff --git a/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch b/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
deleted file mode 100644
index c43da8dfd8ab..000000000000
--- a/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 17d0e3dfcd0690df0e7b212fedcb95402f16935d Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Fri, 23 Jul 2021 10:17:49 +0000
-Subject: [PATCH] IWYU: missing include for using std::vector in hash password
- manager.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build breakage:
-../../components/password_manager/core/browser/hash_password_manager.h:44:8: error: ‘vector’ in namespace ‘std’ does not name a template type
- 44 | std::vector<PasswordHashData> RetrieveAllPasswordHashes();
- | ^~~~~~
-
-Bug: 819294
-Change-Id: I8c8a4ec3972eedb87a312c5ec56adf4a21b1b2a2
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041046
-Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
-Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#904696}
----
- components/password_manager/core/browser/hash_password_manager.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/components/password_manager/core/browser/hash_password_manager.h b/components/password_manager/core/browser/hash_password_manager.h
-index c762c5a8c7713..85e656edcba11 100644
---- a/components/password_manager/core/browser/hash_password_manager.h
-+++ b/components/password_manager/core/browser/hash_password_manager.h
-@@ -6,6 +6,7 @@
- #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_HASH_PASSWORD_MANAGER_H_
-
- #include <string>
-+#include <vector>
-
- #include "base/callback.h"
- #include "base/callback_list.h"
diff --git a/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch b/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
deleted file mode 100644
index 8757eb5c36a9..000000000000
--- a/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2f5514051210388bfcff605570d33f08cfa7bcaa Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Wed, 21 Jul 2021 08:34:58 +0000
-Subject: [PATCH] IWYU: usage of unique_ptr requires including <memory> in
- bluetooth low energy scan filter.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build because of missing include:
-../../device/bluetooth/bluetooth_low_energy_scan_filter.h:57:15: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type
- 57 | static std::unique_ptr<BluetoothLowEnergyScanFilter> Create(
- | ^~~~~~~~~~
-
-Bug: 819294
-Change-Id: I347953a083f1bcdf744fd86e1a73954c6f86b32e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041155
-Reviewed-by: Reilly Grant <reillyg@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#903819}
----
- device/bluetooth/bluetooth_low_energy_scan_filter.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/device/bluetooth/bluetooth_low_energy_scan_filter.h b/device/bluetooth/bluetooth_low_energy_scan_filter.h
-index a0436c184a967..7ae606cca014e 100644
---- a/device/bluetooth/bluetooth_low_energy_scan_filter.h
-+++ b/device/bluetooth/bluetooth_low_energy_scan_filter.h
-@@ -7,6 +7,7 @@
-
- #include <stddef.h>
- #include <stdint.h>
-+#include <memory>
- #include <vector>
-
- #include "base/time/time.h"
diff --git a/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch b/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
deleted file mode 100644
index babfdb367660..000000000000
--- a/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 82e2c8b484c18c621d4b194635e41f171543f1df Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Tue, 27 Jul 2021 08:09:39 +0000
-Subject: [PATCH] IWYU: usage of std::strcpy requires including cstring, in
- extension dialog auto confirm.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build breakage with libstdc++:
- ../../extensions/browser/extension_dialog_auto_confirm.cc: In destructor ‘extensions::ScopedTestDialogAutoConfirm::~ScopedTestDialogAutoConfirm()’:
- ../../extensions/browser/extension_dialog_auto_confirm.cc:43:8: error: ‘strcpy’ is not a member of ‘std’
- 43 | std::strcpy(g_extension_dialog_justification, old_justification_.c_str());
- | ^~~~~~
- ../../extensions/browser/extension_dialog_auto_confirm.cc: In member function ‘void extensions::ScopedTestDialogAutoConfirm::set_justification(const string&)’:
- ../../extensions/browser/extension_dialog_auto_confirm.cc:66:8: error: ‘strcpy’ is not a member of ‘std’
- 66 | std::strcpy(g_extension_dialog_justification, justification.c_str());
- | ^~~~~~
-
-Bug: 957519
-Change-Id: I313c38f22cab599fb8f0e4a339e8143af5bda3ee
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041001
-Reviewed-by: David Bertoni <dbertoni@chromium.org>
-Reviewed-by: Ben Wells <benwells@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#905634}
----
- extensions/browser/extension_dialog_auto_confirm.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/extensions/browser/extension_dialog_auto_confirm.cc b/extensions/browser/extension_dialog_auto_confirm.cc
-index adb4ac3f92ec8..be8b161bc1658 100644
---- a/extensions/browser/extension_dialog_auto_confirm.cc
-+++ b/extensions/browser/extension_dialog_auto_confirm.cc
-@@ -4,6 +4,7 @@
-
- #include "extensions/browser/extension_dialog_auto_confirm.h"
-
-+#include <cstring>
- #include <utility>
-
- #include "base/check.h"
diff --git a/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch b/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
deleted file mode 100644
index e51f76a4b3c0..000000000000
--- a/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Wed, 21 Jul 2021 08:36:20 +0000
-Subject: [PATCH] IWYU: missing memory include for unique_ptr usage in
- class_property.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix GCC build breakage because of missing inclide:
-./../ui/base/class_property.h:120:58: error: ‘std::unique_ptr’ has not been declared
- 120 | T* SetProperty(const ClassProperty<T*>* property, std::unique_ptr<T> value);
- | ^~~~~~~~~~
-
-Bug: 819294
-Change-Id: I46b921876702b8d44674689bbb5acdc107db21e5
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041030
-Reviewed-by: Peter Boström <pbos@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#903820}
----
- ui/base/class_property.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ui/base/class_property.h b/ui/base/class_property.h
-index f7b2f559858b7..88b49386ae0ad 100644
---- a/ui/base/class_property.h
-+++ b/ui/base/class_property.h
-@@ -8,6 +8,7 @@
- #include <stdint.h>
-
- #include <map>
-+#include <memory>
- #include <set>
- #include <type_traits>
-
diff --git a/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch b/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
deleted file mode 100644
index bab64a814b2f..000000000000
--- a/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9c675a1051551af26aaefc6fcd33502a51725396 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Mon, 26 Jul 2021 17:14:51 +0000
-Subject: [PATCH] IWYU: missing include for std::vector usage in devtools
- embedded message dispatcher.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix GCC build breakage:
- ../../chrome/browser/devtools/devtools_embedder_message_dispatcher.h:116:36: error: ‘vector’ in namespace ‘std’ does not name a template type
- 116 | const std::vector<base::Value>& params) = 0;
- | ^~~~~~
-
-Bug: 819294
-Change-Id: I379bf14416c3bfd3c0cdac7bb2542b79781261ec
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041156
-Reviewed-by: Joe Mason <joenotcharles@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#905300}
----
- chrome/browser/devtools/devtools_embedder_message_dispatcher.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-index 12f8500b7811d..4007112f39410 100644
---- a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-+++ b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-@@ -8,6 +8,7 @@
- #include <map>
- #include <memory>
- #include <string>
-+#include <vector>
-
- #include "base/callback.h"
- #include "ui/gfx/geometry/insets.h"
diff --git a/srcpkgs/chromium/patches/9d080c0.patch b/srcpkgs/chromium/patches/9d080c0.patch
new file mode 100644
index 000000000000..885ab5a1b82a
--- /dev/null
+++ b/srcpkgs/chromium/patches/9d080c0.patch
@@ -0,0 +1,196 @@
+From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001
+From: Dylan Cutler <dylancutler@google.com>
+Date: Wed, 26 May 2021 16:39:52 +0000
+Subject: [PATCH] Reland "Replace 'blacklist' with 'ignorelist' in
+ ./tools/msan/."
+
+This is a reland of 3b6263f2eece1264b052dfdcbc03b851d5abfb48
+
+Relanding now that https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2897974 is merged
+
+Original change's description:
+> Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+>
+> Bug: 1097272, 1097268
+> Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+> Commit-Queue: Dylan Cutler <dylancutler@google.com>
+> Reviewed-by: Nico Weber <thakis@chromium.org>
+> Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+> Cr-Commit-Position: refs/heads/master@{#883035}
+
+Bug: 1097272
+Bug: 1097268
+Change-Id: I11a5bc8972680c95fb1dab95ed3b707ed76f4667
+Cq-Include-Trybots: luci.chromium.try:chromeos-amd64-generic-cfi-thin-lto-rel
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2911096
+Commit-Queue: Dylan Cutler <dylancutler@google.com>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#886773}
+---
+ build/config/sanitizers/BUILD.gn | 44 ++++++++++----------
+ build_overrides/build.gni | 14 +++----
+ tools/msan/{blacklist.txt => ignorelist.txt} | 0
+ 3 files changed, 29 insertions(+), 29 deletions(-)
+ rename tools/msan/{blacklist.txt => ignorelist.txt} (100%)
+
+diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn
+index aaaad023474d1..55b388a437439 100644
+--- a/build/config/sanitizers/BUILD.gn
++++ b/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+ if (is_asan) {
+ cflags += [ "-fsanitize=address" ]
+ if (is_win) {
+- if (!defined(asan_win_blacklist_path)) {
+- asan_win_blacklist_path =
++ if (!defined(asan_win_blocklist_path)) {
++ asan_win_blocklist_path =
+ rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+ }
+- cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
++ cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
+ }
+ }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+ cflags = []
+ if (is_cfi && current_toolchain == default_toolchain) {
+- if (!defined(cfi_blacklist_path)) {
+- cfi_blacklist_path =
++ if (!defined(cfi_ignorelist_path)) {
++ cfi_ignorelist_path =
+ rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+ }
+ cflags += [
+ "-fsanitize=cfi-vcall",
+- "-fsanitize-blacklist=$cfi_blacklist_path",
++ "-fsanitize-ignorelist=$cfi_ignorelist_path",
+ ]
+
+ if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+ if (is_msan) {
+ assert(is_linux || is_chromeos,
+ "msan only supported on linux x86_64/ChromeOS")
+- if (!defined(msan_blacklist_path)) {
+- msan_blacklist_path =
+- rebase_path("//tools/msan/blacklist.txt", root_build_dir)
++ if (!defined(msan_ignorelist_path)) {
++ msan_ignorelist_path =
++ rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=memory",
+ "-fsanitize-memory-track-origins=$msan_track_origins",
+- "-fsanitize-blacklist=$msan_blacklist_path",
++ "-fsanitize-ignorelist=$msan_ignorelist_path",
+ ]
+ }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+ if (is_tsan) {
+ assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+- if (!defined(tsan_blacklist_path)) {
+- tsan_blacklist_path =
++ if (!defined(tsan_ignorelist_path)) {
++ tsan_ignorelist_path =
+ rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=thread",
+- "-fsanitize-blacklist=$tsan_blacklist_path",
++ "-fsanitize-ignorelist=$tsan_ignorelist_path",
+ ]
+ }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+ cflags = []
+ if (is_ubsan) {
+- if (!defined(ubsan_blacklist_path)) {
+- ubsan_blacklist_path =
++ if (!defined(ubsan_ignorelist_path)) {
++ ubsan_ignorelist_path =
+ rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+ }
+ cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+ "-fsanitize=signed-integer-overflow",
+ "-fsanitize=unreachable",
+ "-fsanitize=vla-bound",
+- "-fsanitize-blacklist=$ubsan_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_ignorelist_path",
+ ]
+
+ # Chromecast ubsan builds fail to compile with these
+@@ -486,8 +486,8 @@ config("ubsan_no_recover") {
+
+ config("ubsan_security_flags") {
+ if (is_ubsan_security) {
+- if (!defined(ubsan_security_blacklist_path)) {
+- ubsan_security_blacklist_path =
++ if (!defined(ubsan_security_ignorelist_path)) {
++ ubsan_security_ignorelist_path =
+ rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+@@ -495,7 +495,7 @@ config("ubsan_security_flags") {
+ "-fsanitize=shift",
+ "-fsanitize=signed-integer-overflow",
+ "-fsanitize=vla-bound",
+- "-fsanitize-blacklist=$ubsan_security_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
+ ]
+ }
+ }
+@@ -508,13 +508,13 @@ config("ubsan_null_flags") {
+
+ config("ubsan_vptr_flags") {
+ if (is_ubsan_vptr) {
+- if (!defined(ubsan_vptr_blacklist_path)) {
+- ubsan_vptr_blacklist_path =
++ if (!defined(ubsan_vptr_ignorelist_path)) {
++ ubsan_vptr_ignorelist_path =
+ rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=vptr",
+- "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
+ ]
+ }
+ }
+diff --git a/build_overrides/build.gni b/build_overrides/build.gni
+index 82627b03653f1..f3e563ab701bf 100644
+--- a/build_overrides/build.gni
++++ b/build_overrides/build.gni
+@@ -42,15 +42,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_blacklist_path = "path/to/tsan/ignores.txt"
+-# msan_blacklist_path = "path/to/msan/blacklist.txt"
+-# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
+-# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
+-# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
+-# cfi_blacklist_path = "path/to/cfi/ignores.txt"
++# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
++# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
++# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
++# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
++# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
++# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
+
+ declare_args() {
+ # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
+diff --git a/tools/msan/blacklist.txt b/tools/msan/ignorelist.txt
+similarity index 100%
+rename from tools/msan/blacklist.txt
+rename to tools/msan/ignorelist.txt
diff --git a/srcpkgs/chromium/patches/9d080c0.patch.args b/srcpkgs/chromium/patches/9d080c0.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/9d080c0.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/chromium-90-ruy-include.patch b/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
deleted file mode 100644
index 81d5367807be..000000000000
--- a/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Thu, 4 Mar 2021 15:05:46 +0000
-Subject: [PATCH] IWYU: include limits for std::numeric_limits
-
----
- third_party/ruy/src/ruy/block_map.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/ruy/src/ruy/block_map.cc b/third_party/ruy/src/ruy/block_map.cc
-index 44e5039..a7a7559 100644
---- a/third_party/ruy/src/ruy/block_map.cc
-+++ b/third_party/ruy/src/ruy/block_map.cc
-@@ -17,6 +17,7 @@ limitations under the License.
-
- #include <algorithm>
- #include <cstdint>
-+#include <limits>
-
- #ifdef RUY_MAKEBLOCKMAP_DEBUG
- #include <cstdio>
---
-2.26.2
-
diff --git a/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch b/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
deleted file mode 100644
index 72f2abd3e7a6..000000000000
--- a/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 7a6289c5ace52cf88f0e19caa5f78b7c15d0e7a6 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.co.uk>
-Date: Wed, 21 Jul 2021 17:42:30 +0000
-Subject: [PATCH] fxcodec, fxge: fix missing includes with libstdc++
-
-These missing includes break the build with gcc/libstdc++, they were not
-a problem in practice with clang/libc++.
-
-Change-Id: I40013f97ba7ab06f32aa59f87b04aec06a19478c
-Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83210
-Commit-Queue: Lei Zhang <thestig@chromium.org>
-Reviewed-by: Lei Zhang <thestig@chromium.org>
----
-
-diff --git a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-index cea0679..036f250 100644
---- a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-+++ b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-@@ -7,6 +7,7 @@
- #include "core/fxcodec/jpeg/jpegmodule.h"
-
- #include <setjmp.h>
-+#include <string.h>
-
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-index c66985a..9c1122b 100644
---- a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-+++ b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxcodec/jpx/cjpx_decoder.h"
-
-+#include <string.h>
-+
- #include <algorithm>
- #include <limits>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-index 5369d52..d198852 100644
---- a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-+++ b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/cfx_cliprgn.h"
-
-+#include <string.h>
-+
- #include <utility>
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-index 6f9b420..0f1ffae 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_bitmapcomposer.h"
-
-+#include <string.h>
-+
- #include "core/fxge/cfx_cliprgn.h"
- #include "core/fxge/dib/cfx_dibitmap.h"
-
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-index f57c00e..45a0a18 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_bitmapstorer.h"
-
-+#include <string.h>
-+
- #include <utility>
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-index 4ec0ddb..a1de2fb 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_dibbase.h"
-
-+#include <string.h>
-+
- #include <algorithm>
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-index d7ccf6c..94e8acc 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-
-+#include <string.h>
-+
- #include <limits>
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-index e8362d7..c04c6dc 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_scanlinecompositor.h"
-
-+#include <string.h>
-+
- #include <algorithm>
-
- #include "core/fxge/dib/fx_dib.h"
diff --git a/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch b/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
new file mode 100644
index 000000000000..01757758c1e2
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
@@ -0,0 +1,24 @@
+From 4eeacdaa57b29a079fe09315eb22557c06aa522e Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 13 Aug 2021 12:57:42 +0000
+Subject: [PATCH] IWYU: add memory for std::unique_ptr in blink::CustomSpaces
+
+---
+ .../blink/renderer/platform/heap/v8_wrapper/custom_spaces.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
+index df0465a..640cb33 100644
+--- a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
++++ b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
+@@ -5,6 +5,7 @@
+ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
+ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
+
++#include <memory>
+ #include <vector>
+
+ #include "third_party/blink/renderer/platform/platform_export.h"
+--
+2.31.1
+
diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
new file mode 100644
index 000000000000..68f26364eda7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
@@ -0,0 +1,49 @@
+From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001
+From: "liberato@chromium.org" <liberato@chromium.org>
+Date: Fri, 6 Aug 2021 04:25:31 +0000
+Subject: [PATCH] FFmpeg M94 roll.
+
+Contains DEPS update + chromium-side fixes.
+
+Bug: 1227259
+Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889
+Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
+Commit-Queue: Frank Liberato <liberato@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#909174}
+---
+ media/ffmpeg/ffmpeg_common.h | 1 +
+ media/filters/ffmpeg_demuxer.cc | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
+index cede8ac5a7..97d6307e28 100644
+--- a/media/ffmpeg/ffmpeg_common.h
++++ b/media/ffmpeg/ffmpeg_common.h
+@@ -29,6 +29,7 @@ extern "C" {
+ #include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
++#include <libavutil/channel_layout.h>
+ #include <libavutil/imgutils.h>
+ #include <libavutil/log.h>
+ #include <libavutil/mastering_display_metadata.h>
+diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
+index ac4713b072..605001d935 100644
+--- a/media/filters/ffmpeg_demuxer.cc
++++ b/media/filters/ffmpeg_demuxer.cc
+@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
+
+ // Next try to use the first DTS value, for codecs where we know PTS == DTS
+ // (excludes all H26x codecs). The start time must be returned in PTS.
+- if (stream->first_dts != kNoFFmpegTimestamp &&
++ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
+ stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
+ stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
+ stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
+ const base::TimeDelta first_pts =
+- ConvertFromTimeBase(stream->time_base, stream->first_dts);
++ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
+ if (first_pts < start_time)
+ start_time = first_pts;
+ }
diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/chromium-webrtc-r0.patch b/srcpkgs/chromium/patches/chromium-webrtc-r0.patch
deleted file mode 100644
index 67574f6d540c..000000000000
--- a/srcpkgs/chromium/patches/chromium-webrtc-r0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream: Yes, https://webrtc-review.googlesource.com/9384
-Reason: Fixes musl builds of webrtc
-
-From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Fri, 13 Oct 2017 15:49:32 +0200
-Subject: [PATCH] IWYU: Include math.h for round(3).
-
-math.h was being implicitly included, which can break the build with
-alternative libc implementations.
-
-Bug: None
-Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
-Reviewed-on: https://webrtc-review.googlesource.com/9384
-Reviewed-by: Tommi <tommi@webrtc.org>
-Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
-Cr-Commit-Position: refs/heads/master@{#20292}
----
-
---- a/third_party/webrtc/p2p/base/port.cc
-+++ b/third_party/webrtc/p2p/base/port.cc
-@@ -10,6 +10,8 @@
-
- #include "p2p/base/port.h"
-
-+#include <math.h>
-+
- #include <algorithm>
- #include <vector>
-
---
-2.15.0.rc2
-
diff --git a/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch b/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
deleted file mode 100644
index 4a99f1de2874..000000000000
--- a/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
+++ /dev/null
@@ -1,1384 +0,0 @@
-From 4b438323d68840453b5ef826c3997568e2e0e8c7 Mon Sep 17 00:00:00 2001
-From: Matthew Denton <mpdenton@chromium.org>
-Date: Mon, 19 Jul 2021 14:03:13 +0000
-Subject: [PATCH] Reland "Reland "Linux sandbox syscall broker: use struct
- kernel_stat""
-
-This reverts commit ff277a52ece0b216617d770f201ed66955fe70b9.
-
-Reason for revert: reland
-
-The fix included in the reland is that fstatat64() needs to be
-allowed in the broker process's seccomp policy.
-
-This CL also includes some extra tests that the kernel_stat structures
-match the layout the kernel expects.
-
-Bug: 1164975, 1199431
-Test: trogdor Chromebook successfully boots and allows login.
-
-Original change's description:
-> Revert "Reland "Linux sandbox syscall broker: use struct kernel_stat""
->
-> This reverts commit cffbc4432af79f720ae3c75dff380b853701bd64.
->
-> Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1199431
->
-> Original change's description:
-> > Reland "Linux sandbox syscall broker: use struct kernel_stat"
-> >
-> > This reverts commit 23030dc650cdfa22631f25bef937905f27f06a2c.
-> >
-> > Original change's description:
-> > > Revert "Linux sandbox syscall broker: use struct kernel_stat"
-> > >
-> > > This reverts commit 784b0fcd8a3ca6bcd3acb9cfd624ec9cbbac2789.
-> > >
-> > > Reason for revert: Causing failure in
-> > > Step "sandbox_linux_unittests" failing on builder "Linux ChromiumOS MSan Tests"
-> > > See crbug.com/1198480
-> > >
-> > > Original change's description:
-> > > > Linux sandbox syscall broker: use struct kernel_stat
-> > > >
-> > > > The struct stat used in libc is different (in size and field ordering)
-> > > > from the structure assumed by the Linux kernel. So, when emulating
-> > > > system calls, we need to use the struct definition the kernel expects.
-> > > >
-> > > > This CL adds linux_stat.h that includes definitions of the different
-> > > > kernel structs.
-> > > >
-> > > > Change-Id: I53cad35c2251dff0f6b7ea77528cfa58ef3cab4a
-> > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2780876
-> > > > Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> > > > Reviewed-by: Robert Sesek <rsesek@chromium.org>
-> > > > Cr-Commit-Position: refs/heads/master@{#871767}
-> > >
-> > > Change-Id: Icbec38f2103c8424dec79ab1870b97c3e83f9361
-> > > No-Presubmit: true
-> > > No-Tree-Checks: true
-> > > No-Try: true
-> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2821812
-> > > Auto-Submit: Victor Vianna <victorvianna@google.com>
-> > > Owners-Override: Victor Vianna <victorvianna@google.com>
-> > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-> > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-> > > Cr-Commit-Position: refs/heads/master@{#871882}
-> >
-> > Change-Id: I1f39bb5242961474def594ff7dbea52009f2cee4
-> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2824115
-> > Auto-Submit: Matthew Denton <mpdenton@chromium.org>
-> > Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> > Reviewed-by: Robert Sesek <rsesek@chromium.org>
-> > Cr-Commit-Position: refs/heads/master@{#872812}
->
-> Fixed: 1199431
-> Change-Id: Iebfc0c48201bf22ff9c54d8d5c8a43d26a880098
-> No-Presubmit: true
-> No-Tree-Checks: true
-> No-Try: true
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2830459
-> Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
-> Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
-> Reviewed-by: Matthew Denton <mpdenton@chromium.org>
-> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
-> Owners-Override: Kinuko Yasuda <kinuko@chromium.org>
-> Cr-Commit-Position: refs/heads/master@{#873173}
-
-Change-Id: Ibe6a485070f33489aaa157b51b908c2d23d174d7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2848936
-Reviewed-by: Robert Sesek <rsesek@chromium.org>
-Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#902981}
----
- sandbox/linux/BUILD.gn | 1 +
- .../seccomp_broker_process_unittest.cc | 40 +++-
- sandbox/linux/seccomp-bpf-helpers/DEPS | 1 -
- ...scall_parameters_restrictions_unittests.cc | 4 -
- sandbox/linux/services/syscall_wrappers.cc | 50 ++++-
- sandbox/linux/services/syscall_wrappers.h | 15 ++
- .../services/syscall_wrappers_unittest.cc | 129 +++++++++++-
- sandbox/linux/syscall_broker/DEPS | 3 +-
- sandbox/linux/syscall_broker/broker_client.cc | 4 +-
- sandbox/linux/syscall_broker/broker_client.h | 4 +-
- sandbox/linux/syscall_broker/broker_host.cc | 23 ++-
- .../syscall_broker/broker_process_unittest.cc | 74 +++----
- .../remote_syscall_arg_handler_unittest.cc | 36 ++--
- .../syscall_broker/syscall_dispatcher.cc | 67 ++++---
- .../linux/syscall_broker/syscall_dispatcher.h | 27 ++-
- sandbox/linux/system_headers/linux_stat.h | 188 ++++++++++++++++++
- sandbox/linux/system_headers/linux_time.h | 26 +++
- sandbox/linux/tests/test_utils.cc | 15 ++
- sandbox/linux/tests/test_utils.h | 2 +
- .../policy/linux/bpf_broker_policy_linux.cc | 4 +-
- 20 files changed, 595 insertions(+), 118 deletions(-)
- create mode 100644 sandbox/linux/system_headers/linux_stat.h
-
-diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
-index 2f778dd0bcab2..ccbbc91716e71 100644
---- a/sandbox/linux/BUILD.gn
-+++ b/sandbox/linux/BUILD.gn
-@@ -443,6 +443,7 @@ source_set("sandbox_services_headers") {
- "system_headers/linux_ptrace.h",
- "system_headers/linux_seccomp.h",
- "system_headers/linux_signal.h",
-+ "system_headers/linux_stat.h",
- "system_headers/linux_syscalls.h",
- "system_headers/linux_time.h",
- "system_headers/linux_ucontext.h",
-diff --git a/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc b/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-index 9da9c68911428..8a941983b198d 100644
---- a/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-+++ b/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-@@ -34,6 +34,7 @@
- #include "sandbox/linux/syscall_broker/broker_file_permission.h"
- #include "sandbox/linux/syscall_broker/broker_process.h"
- #include "sandbox/linux/system_headers/linux_seccomp.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
- #include "sandbox/linux/tests/scoped_temporary_file.h"
- #include "sandbox/linux/tests/test_utils.h"
-@@ -202,6 +203,26 @@ namespace {
- // not accept this as a valid error number. E.g. bionic accepts up to 255, glibc
- // and musl up to 4096.
- const int kFakeErrnoSentinel = 254;
-+
-+void ConvertKernelStatToLibcStat(default_stat_struct& in_stat,
-+ struct stat& out_stat) {
-+ out_stat.st_dev = in_stat.st_dev;
-+ out_stat.st_ino = in_stat.st_ino;
-+ out_stat.st_mode = in_stat.st_mode;
-+ out_stat.st_nlink = in_stat.st_nlink;
-+ out_stat.st_uid = in_stat.st_uid;
-+ out_stat.st_gid = in_stat.st_gid;
-+ out_stat.st_rdev = in_stat.st_rdev;
-+ out_stat.st_size = in_stat.st_size;
-+ out_stat.st_blksize = in_stat.st_blksize;
-+ out_stat.st_blocks = in_stat.st_blocks;
-+ out_stat.st_atim.tv_sec = in_stat.st_atime_;
-+ out_stat.st_atim.tv_nsec = in_stat.st_atime_nsec_;
-+ out_stat.st_mtim.tv_sec = in_stat.st_mtime_;
-+ out_stat.st_mtim.tv_nsec = in_stat.st_mtime_nsec_;
-+ out_stat.st_ctim.tv_sec = in_stat.st_ctime_;
-+ out_stat.st_ctim.tv_nsec = in_stat.st_ctime_nsec_;
-+}
- } // namespace
-
- // There are a variety of ways to make syscalls in a sandboxed process. One is
-@@ -217,6 +238,10 @@ class Syscaller {
-
- virtual int Open(const char* filepath, int flags) = 0;
- virtual int Access(const char* filepath, int mode) = 0;
-+ // NOTE: we use struct stat instead of default_stat_struct, to make the libc
-+ // syscaller simpler. Copying from default_stat_struct (the structure returned
-+ // from a stat sycall) to struct stat (the structure exposed by a libc to its
-+ // users) is simpler than going in the opposite direction.
- virtual int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) = 0;
-@@ -243,8 +268,12 @@ class IPCSyscaller : public Syscaller {
- int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) override {
-- return broker_->GetBrokerClientSignalBased()->Stat(filepath, follow_links,
-- statbuf);
-+ default_stat_struct buf;
-+ int ret = broker_->GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ filepath, follow_links, &buf);
-+ if (ret >= 0)
-+ ConvertKernelStatToLibcStat(buf, *statbuf);
-+ return ret;
- }
-
- int Rename(const char* oldpath, const char* newpath) override {
-@@ -300,10 +329,13 @@ class DirectSyscaller : public Syscaller {
- int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) override {
-- int ret = follow_links ? syscall(__NR_stat, filepath, statbuf)
-- : syscall(__NR_lstat, filepath, statbuf);
-+ struct kernel_stat buf;
-+ int ret = syscall(__NR_newfstatat, AT_FDCWD, filepath, &buf,
-+ follow_links ? 0 : AT_SYMLINK_NOFOLLOW);
- if (ret < 0)
- return -errno;
-+
-+ ConvertKernelStatToLibcStat(buf, *statbuf);
- return ret;
- }
-
-diff --git a/sandbox/linux/seccomp-bpf-helpers/DEPS b/sandbox/linux/seccomp-bpf-helpers/DEPS
-index 4419fd1da34e8..95d1bb6cbbabf 100644
---- a/sandbox/linux/seccomp-bpf-helpers/DEPS
-+++ b/sandbox/linux/seccomp-bpf-helpers/DEPS
-@@ -3,5 +3,4 @@ include_rules = [
- "+sandbox/linux/seccomp-bpf",
- "+sandbox/linux/services",
- "+sandbox/linux/system_headers",
-- "+third_party/lss/linux_syscall_support.h",
- ]
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-index 903e702eab14b..76c393032c1fe 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-@@ -37,10 +37,6 @@
- #include "sandbox/linux/system_headers/linux_time.h"
- #include "sandbox/linux/tests/unit_tests.h"
-
--#if !defined(OS_ANDROID)
--#include "third_party/lss/linux_syscall_support.h" // for MAKE_PROCESS_CPUCLOCK
--#endif
--
- namespace sandbox {
-
- namespace {
-diff --git a/sandbox/linux/services/syscall_wrappers.cc b/sandbox/linux/services/syscall_wrappers.cc
-index fcfd2aa129d4b..3bec18a14e91e 100644
---- a/sandbox/linux/services/syscall_wrappers.cc
-+++ b/sandbox/linux/services/syscall_wrappers.cc
-@@ -4,6 +4,7 @@
-
- #include "sandbox/linux/services/syscall_wrappers.h"
-
-+#include <fcntl.h>
- #include <pthread.h>
- #include <sched.h>
- #include <setjmp.h>
-@@ -14,11 +15,13 @@
- #include <unistd.h>
- #include <cstring>
-
-+#include "base/check.h"
- #include "base/compiler_specific.h"
- #include "base/logging.h"
- #include "build/build_config.h"
- #include "sandbox/linux/system_headers/capability.h"
- #include "sandbox/linux/system_headers/linux_signal.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
-
- namespace sandbox {
-@@ -217,7 +220,7 @@ asm(
- #undef STR
- #undef XSTR
-
--#endif
-+#endif // defined(ARCH_CPU_X86_FAMILY)
-
- int sys_sigaction(int signum,
- const struct sigaction* act,
-@@ -241,7 +244,7 @@ int sys_sigaction(int signum,
- #error "Unsupported architecture."
- #endif
- }
--#endif
-+#endif // defined(ARCH_CPU_X86_FAMILY)
- }
-
- LinuxSigAction linux_oldact = {};
-@@ -259,6 +262,47 @@ int sys_sigaction(int signum,
- return result;
- }
-
--#endif // defined(MEMORY_SANITIZER)
-+#endif // !defined(OS_NACL_NONSFI)
-+
-+int sys_stat(const char* path, struct kernel_stat* stat_buf) {
-+ int res;
-+#if !defined(__NR_stat)
-+ res = syscall(__NR_newfstatat, AT_FDCWD, path, stat_buf, 0);
-+#else
-+ res = syscall(__NR_stat, path, stat_buf);
-+#endif
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+}
-+
-+int sys_lstat(const char* path, struct kernel_stat* stat_buf) {
-+ int res;
-+#if !defined(__NR_lstat)
-+ res = syscall(__NR_newfstatat, AT_FDCWD, path, stat_buf, AT_SYMLINK_NOFOLLOW);
-+#else
-+ res = syscall(__NR_lstat, path, stat_buf);
-+#endif
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+}
-+
-+int sys_fstatat64(int dirfd,
-+ const char* pathname,
-+ struct kernel_stat64* stat_buf,
-+ int flags) {
-+#if defined(__NR_fstatat64)
-+ int res = syscall(__NR_fstatat64, dirfd, pathname, stat_buf, flags);
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+#else // defined(__NR_fstatat64)
-+ // We should not reach here on 64-bit systems, as the *stat*64() are only
-+ // necessary on 32-bit.
-+ RAW_CHECK(false);
-+ return -ENOSYS;
-+#endif
-+}
-
- } // namespace sandbox
-diff --git a/sandbox/linux/services/syscall_wrappers.h b/sandbox/linux/services/syscall_wrappers.h
-index 1975bfbd88a6d..b55340e4a26b7 100644
---- a/sandbox/linux/services/syscall_wrappers.h
-+++ b/sandbox/linux/services/syscall_wrappers.h
-@@ -17,6 +17,8 @@ struct sock_fprog;
- struct rlimit64;
- struct cap_hdr;
- struct cap_data;
-+struct kernel_stat;
-+struct kernel_stat64;
-
- namespace sandbox {
-
-@@ -84,6 +86,19 @@ SANDBOX_EXPORT int sys_sigaction(int signum,
- const struct sigaction* act,
- struct sigaction* oldact);
-
-+// Some architectures do not have stat() and lstat() syscalls. In that case,
-+// these wrappers will use newfstatat(), which is available on all other
-+// architectures, with the same capabilities as stat() and lstat().
-+SANDBOX_EXPORT int sys_stat(const char* path, struct kernel_stat* stat_buf);
-+SANDBOX_EXPORT int sys_lstat(const char* path, struct kernel_stat* stat_buf);
-+
-+// Takes care of unpoisoning |stat_buf| for MSAN. Check-fails if fstatat64() is
-+// not a supported syscall on the current platform.
-+SANDBOX_EXPORT int sys_fstatat64(int dirfd,
-+ const char* pathname,
-+ struct kernel_stat64* stat_buf,
-+ int flags);
-+
- } // namespace sandbox
-
- #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
-diff --git a/sandbox/linux/services/syscall_wrappers_unittest.cc b/sandbox/linux/services/syscall_wrappers_unittest.cc
-index 32820f60a8cee..64b9cea80f319 100644
---- a/sandbox/linux/services/syscall_wrappers_unittest.cc
-+++ b/sandbox/linux/services/syscall_wrappers_unittest.cc
-@@ -5,15 +5,19 @@
- #include "sandbox/linux/services/syscall_wrappers.h"
-
- #include <stdint.h>
-+#include <string.h>
- #include <sys/syscall.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
--#include <cstring>
-
-+#include "base/logging.h"
-+#include "base/memory/page_size.h"
- #include "base/posix/eintr_wrapper.h"
- #include "build/build_config.h"
- #include "sandbox/linux/system_headers/linux_signal.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
-+#include "sandbox/linux/tests/scoped_temporary_file.h"
- #include "sandbox/linux/tests/test_utils.h"
- #include "sandbox/linux/tests/unit_tests.h"
- #include "testing/gtest/include/gtest/gtest.h"
-@@ -93,6 +97,129 @@ TEST(SyscallWrappers, LinuxSigSet) {
- linux_sigset);
- }
-
-+TEST(SyscallWrappers, Stat) {
-+ // Create a file to stat, with 12 bytes of data.
-+ ScopedTemporaryFile tmp_file;
-+ EXPECT_EQ(12, write(tmp_file.fd(), "blahblahblah", 12));
-+
-+ // To test we have the correct stat structures for each kernel/platform, we
-+ // will right-align them on a page, with a guard page after.
-+ char* two_pages = static_cast<char*>(TestUtils::MapPagesOrDie(2));
-+ TestUtils::MprotectLastPageOrDie(two_pages, 2);
-+ char* page1_end = two_pages + base::GetPageSize();
-+
-+ // First, check that calling stat with |stat_buf| pointing to the last byte on
-+ // a page causes EFAULT.
-+ int res = sys_stat(tmp_file.full_file_name(),
-+ reinterpret_cast<struct kernel_stat*>(page1_end - 1));
-+ ASSERT_EQ(res, -1);
-+ ASSERT_EQ(errno, EFAULT);
-+
-+ // Now, check that we have the correctly sized stat structure.
-+ struct kernel_stat* sb = reinterpret_cast<struct kernel_stat*>(
-+ page1_end - sizeof(struct kernel_stat));
-+ // Memset to c's so we can check the kernel zero'd the padding...
-+ memset(sb, 'c', sizeof(struct kernel_stat));
-+ res = sys_stat(tmp_file.full_file_name(), sb);
-+ ASSERT_EQ(res, 0);
-+
-+ // Following fields may never be consistent but should be non-zero.
-+ // Don't trust the platform to define fields with any particular sign.
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_dev));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_ino));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_mode));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_blksize));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_blocks));
-+
-+// We are the ones that made the file.
-+// Note: normally gid and uid overflow on backwards-compatible 32-bit systems
-+// and we end up with dummy uids and gids in place here.
-+#if defined(ARCH_CPU_64_BITS)
-+ EXPECT_EQ(geteuid(), sb->st_uid);
-+ EXPECT_EQ(getegid(), sb->st_gid);
-+#endif
-+
-+ // Wrote 12 bytes above which should fit in one block.
-+ EXPECT_EQ(12u, sb->st_size);
-+
-+ // Can't go backwards in time, 1500000000 was some time ago.
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_atime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_mtime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_ctime_));
-+
-+ // Checking the padding for good measure.
-+#if defined(__x86_64__)
-+ EXPECT_EQ(0u, sb->__pad0);
-+ EXPECT_EQ(0u, sb->__unused4[0]);
-+ EXPECT_EQ(0u, sb->__unused4[1]);
-+ EXPECT_EQ(0u, sb->__unused4[2]);
-+#elif defined(__aarch64__)
-+ EXPECT_EQ(0u, sb->__pad1);
-+ EXPECT_EQ(0, sb->__pad2);
-+ EXPECT_EQ(0u, sb->__unused4);
-+ EXPECT_EQ(0u, sb->__unused5);
-+#endif
-+}
-+
-+TEST(SyscallWrappers, LStat) {
-+ // Create a file to stat, with 12 bytes of data.
-+ ScopedTemporaryFile tmp_file;
-+ EXPECT_EQ(12, write(tmp_file.fd(), "blahblahblah", 12));
-+
-+ // Also create a symlink.
-+ std::string symlink_name;
-+ {
-+ ScopedTemporaryFile tmp_file2;
-+ symlink_name = tmp_file2.full_file_name();
-+ }
-+ int rc = symlink(tmp_file.full_file_name(), symlink_name.c_str());
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't symlink " << symlink_name << " to target "
-+ << tmp_file.full_file_name();
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat lstat_info;
-+ rc = sys_lstat(symlink_name.c_str(), &lstat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_lstat " << symlink_name;
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat stat_info;
-+ rc = sys_stat(symlink_name.c_str(), &stat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_stat " << symlink_name;
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat tmp_file_stat_info;
-+ rc = sys_stat(tmp_file.full_file_name(), &tmp_file_stat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_stat " << tmp_file.full_file_name();
-+ GTEST_FAIL();
-+ }
-+
-+ // lstat should produce information about a symlink.
-+ ASSERT_TRUE(S_ISLNK(lstat_info.st_mode));
-+
-+ // stat-ing symlink_name and tmp_file should produce the same inode.
-+ ASSERT_EQ(stat_info.st_ino, tmp_file_stat_info.st_ino);
-+
-+ // lstat-ing symlink_name should give a different inode than stat-ing
-+ // symlink_name.
-+ ASSERT_NE(stat_info.st_ino, lstat_info.st_ino);
-+}
-+
- } // namespace
-
- } // namespace sandbox
-diff --git a/sandbox/linux/syscall_broker/DEPS b/sandbox/linux/syscall_broker/DEPS
-index c477f7d36394b..149c463b06839 100644
---- a/sandbox/linux/syscall_broker/DEPS
-+++ b/sandbox/linux/syscall_broker/DEPS
-@@ -1,4 +1,5 @@
- include_rules = [
-- "+sandbox/linux/system_headers",
- "+sandbox/linux/bpf_dsl",
-+ "+sandbox/linux/services",
-+ "+sandbox/linux/system_headers",
- ]
-diff --git a/sandbox/linux/syscall_broker/broker_client.cc b/sandbox/linux/syscall_broker/broker_client.cc
-index 6b1b5be433899..e24f659fcf872 100644
---- a/sandbox/linux/syscall_broker/broker_client.cc
-+++ b/sandbox/linux/syscall_broker/broker_client.cc
-@@ -166,7 +166,7 @@ int BrokerClient::Rmdir(const char* path) const {
-
- int BrokerClient::Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const {
-+ struct kernel_stat* sb) const {
- if (!pathname || !sb)
- return -EFAULT;
-
-@@ -181,7 +181,7 @@ int BrokerClient::Stat(const char* pathname,
-
- int BrokerClient::Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const {
-+ struct kernel_stat64* sb) const {
- if (!pathname || !sb)
- return -EFAULT;
-
-diff --git a/sandbox/linux/syscall_broker/broker_client.h b/sandbox/linux/syscall_broker/broker_client.h
-index 05e14c83f2010..26ca78101c71c 100644
---- a/sandbox/linux/syscall_broker/broker_client.h
-+++ b/sandbox/linux/syscall_broker/broker_client.h
-@@ -61,10 +61,10 @@ class SANDBOX_EXPORT BrokerClient : public SyscallDispatcher {
- int Rmdir(const char* path) const override;
- int Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const override;
-+ struct kernel_stat* sb) const override;
- int Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const override;
-+ struct kernel_stat64* sb) const override;
- int Unlink(const char* unlink) const override;
-
- private:
-diff --git a/sandbox/linux/syscall_broker/broker_host.cc b/sandbox/linux/syscall_broker/broker_host.cc
-index 1cd03a18df809..1cdc01a888f41 100644
---- a/sandbox/linux/syscall_broker/broker_host.cc
-+++ b/sandbox/linux/syscall_broker/broker_host.cc
-@@ -20,9 +20,11 @@
- #include "base/files/scoped_file.h"
- #include "base/logging.h"
- #include "base/posix/eintr_wrapper.h"
-+#include "sandbox/linux/services/syscall_wrappers.h"
- #include "sandbox/linux/syscall_broker/broker_command.h"
- #include "sandbox/linux/syscall_broker/broker_permission_list.h"
- #include "sandbox/linux/syscall_broker/broker_simple_message.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
-
- namespace sandbox {
-@@ -193,10 +195,12 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(reply->AddIntToMessage(-permission_list.denied_errno()));
- return;
- }
-+
- if (command_type == COMMAND_STAT) {
-- struct stat sb;
-- int sts =
-- follow_links ? stat(file_to_access, &sb) : lstat(file_to_access, &sb);
-+ struct kernel_stat sb;
-+
-+ int sts = follow_links ? sandbox::sys_stat(file_to_access, &sb)
-+ : sandbox::sys_lstat(file_to_access, &sb);
- if (sts < 0) {
- RAW_CHECK(reply->AddIntToMessage(-errno));
- return;
-@@ -205,10 +209,12 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(
- reply->AddDataToMessage(reinterpret_cast<char*>(&sb), sizeof(sb)));
- } else {
-+#if defined(__NR_fstatat64)
- DCHECK(command_type == COMMAND_STAT64);
-- struct stat64 sb;
-- int sts = follow_links ? stat64(file_to_access, &sb)
-- : lstat64(file_to_access, &sb);
-+ struct kernel_stat64 sb;
-+
-+ int sts = sandbox::sys_fstatat64(AT_FDCWD, file_to_access, &sb,
-+ follow_links ? 0 : AT_SYMLINK_NOFOLLOW);
- if (sts < 0) {
- RAW_CHECK(reply->AddIntToMessage(-errno));
- return;
-@@ -216,6 +222,11 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(reply->AddIntToMessage(0));
- RAW_CHECK(
- reply->AddDataToMessage(reinterpret_cast<char*>(&sb), sizeof(sb)));
-+#else // defined(__NR_fstatat64)
-+ // We should not reach here on 64-bit systems, as the *stat*64() are only
-+ // necessary on 32-bit.
-+ RAW_CHECK(false);
-+#endif
- }
- }
-
-diff --git a/sandbox/linux/syscall_broker/broker_process_unittest.cc b/sandbox/linux/syscall_broker/broker_process_unittest.cc
-index 55ba6bccb29ec..c65f25a78a999 100644
---- a/sandbox/linux/syscall_broker/broker_process_unittest.cc
-+++ b/sandbox/linux/syscall_broker/broker_process_unittest.cc
-@@ -811,7 +811,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- const char* bad_leading_path5 = "/mbogo/fictitioux";
- const char* bad_leading_path6 = "/mbogo/fictitiousa";
-
-- struct stat sb;
-+ default_stat_struct sb;
-
- {
- // Actual file with permissions to see file but command not allowed.
-@@ -824,7 +824,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- tempfile_name, follow_links, &sb));
- }
-
-@@ -840,7 +840,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- nonesuch_name, follow_links, &sb));
- }
- {
-@@ -852,7 +852,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- tempfile_name, follow_links, &sb));
- }
- {
-@@ -864,38 +864,39 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- nonesuch_name, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ nonesuch_name, follow_links, &sb));
-
- // Gets denied all the way back to root since no create permission.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path3, follow_links, &sb));
-
- // Not fooled by substrings.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path3, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path4, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path5, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path6, follow_links, &sb));
- }
- {
-@@ -907,37 +908,41 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- nonesuch_name, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ nonesuch_name, follow_links, &sb));
-
- // Gets ENOENT all the way back to root since it has create permission.
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path1, follow_links, &sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path2, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path1, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path2, follow_links, &sb));
-
- // But can always get the root.
-- EXPECT_EQ(0, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path3, follow_links, &sb));
-+ EXPECT_EQ(0,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path3, follow_links, &sb));
-
- // Not fooled by substrings.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path3, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path4, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path5, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path6, follow_links, &sb));
- }
- {
-@@ -949,8 +954,9 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(0, open_broker.GetBrokerClientSignalBased()->Stat(
-- tempfile_name, follow_links, &sb));
-+ EXPECT_EQ(0,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ tempfile_name, follow_links, &sb));
-
- // Following fields may never be consistent but should be non-zero.
- // Don't trust the platform to define fields with any particular sign.
-@@ -968,9 +974,9 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- EXPECT_EQ(12, sb.st_size);
-
- // Can't go backwards in time, 1500000000 was some time ago.
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_atime));
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_mtime));
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_ctime));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_atime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_mtime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_ctime_));
- }
- }
-
-diff --git a/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc b/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-index fffa9bb7082ce..f517a9867c5de 100644
---- a/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-+++ b/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-@@ -16,6 +16,7 @@
- #include "base/memory/page_size.h"
- #include "base/posix/unix_domain_socket.h"
- #include "base/test/bind.h"
-+#include "sandbox/linux/tests/test_utils.h"
- #include "sandbox/linux/tests/unit_tests.h"
- #include "testing/gtest/include/gtest/gtest.h"
-
-@@ -52,19 +53,6 @@ void VerifyCorrectString(std::string str, size_t size) {
- }
- }
-
--void* MapPagesOrDie(size_t num_pages) {
-- void* addr = mmap(nullptr, num_pages * base::GetPageSize(),
-- PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-- PCHECK(addr);
-- return addr;
--}
--
--void MprotectLastPageOrDie(char* addr, size_t num_pages) {
-- size_t last_page_offset = (num_pages - 1) * base::GetPageSize();
-- PCHECK(mprotect(addr + last_page_offset, base::GetPageSize(), PROT_NONE) >=
-- 0);
--}
--
- pid_t ForkWaitingChild(base::OnceCallback<void(int)>
- after_parent_signals_callback = base::DoNothing(),
- base::ScopedFD* parent_sync_fd = nullptr) {
-@@ -105,13 +93,13 @@ void ReadTest(const ReadTestConfig& test_config) {
- size_t total_pages = (test_config.start_at + test_config.total_size +
- base::GetPageSize() - 1) /
- base::GetPageSize();
-- char* mmap_addr = static_cast<char*>(MapPagesOrDie(total_pages));
-+ char* mmap_addr = static_cast<char*>(TestUtils::MapPagesOrDie(total_pages));
- char* addr = mmap_addr + test_config.start_at;
- FillBufferWithPath(addr, test_config.total_size,
- test_config.include_null_byte);
-
- if (test_config.last_page_inaccessible)
-- MprotectLastPageOrDie(mmap_addr, total_pages);
-+ TestUtils::MprotectLastPageOrDie(mmap_addr, total_pages);
-
- pid_t pid = ForkWaitingChild();
- munmap(mmap_addr, base::GetPageSize() * total_pages);
-@@ -212,7 +200,7 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChunkPlus1EndingOnePastPage) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChildExited) {
-- void* addr = MapPagesOrDie(1);
-+ void* addr = TestUtils::MapPagesOrDie(1);
- FillBufferWithPath(static_cast<char*>(addr), strlen(kPathPart) + 1, true);
-
- base::ScopedFD parent_sync, child_sync;
-@@ -240,10 +228,10 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChildExited) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, BasicWrite) {
-- void* read_from = MapPagesOrDie(1);
-+ void* read_from = TestUtils::MapPagesOrDie(1);
- const size_t write_size = base::GetPageSize();
- FillBufferWithPath(static_cast<char*>(read_from), write_size, false);
-- char* write_to = static_cast<char*>(MapPagesOrDie(1));
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(1));
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-
-@@ -278,8 +266,8 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, BasicWrite) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteToInvalidAddress) {
-- char* write_to = static_cast<char*>(MapPagesOrDie(1));
-- MprotectLastPageOrDie(write_to, 1);
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(1));
-+ TestUtils::MprotectLastPageOrDie(write_to, 1);
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-
-@@ -295,11 +283,11 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteToInvalidAddress) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WritePartiallyToInvalidAddress) {
-- char* read_from = static_cast<char*>(MapPagesOrDie(2));
-+ char* read_from = static_cast<char*>(TestUtils::MapPagesOrDie(2));
- const size_t write_size = base::GetPageSize();
- FillBufferWithPath(static_cast<char*>(read_from), write_size, false);
-- char* write_to = static_cast<char*>(MapPagesOrDie(2));
-- MprotectLastPageOrDie(write_to, 2);
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(2));
-+ TestUtils::MprotectLastPageOrDie(write_to, 2);
- write_to += base::GetPageSize() / 2;
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-@@ -314,7 +302,7 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WritePartiallyToInvalidAddress) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteChildExited) {
-- char* addr = static_cast<char*>(MapPagesOrDie(1));
-+ char* addr = static_cast<char*>(TestUtils::MapPagesOrDie(1));
- FillBufferWithPath(static_cast<char*>(addr), strlen(kPathPart) + 1, true);
-
- base::ScopedFD parent_sync, child_sync;
-diff --git a/sandbox/linux/syscall_broker/syscall_dispatcher.cc b/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-index b9ee93c14ac59..8a42397ef872e 100644
---- a/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-+++ b/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-@@ -19,8 +19,18 @@ namespace syscall_broker {
- #define BROKER_UNPOISON_STRING(x)
- #endif
-
-+int SyscallDispatcher::DefaultStatForTesting(const char* pathname,
-+ bool follow_links,
-+ default_stat_struct* sb) {
-+#if defined(__NR_fstatat64)
-+ return Stat64(pathname, follow_links, sb);
-+#elif defined(__NR_newfstatat)
-+ return Stat(pathname, follow_links, sb);
-+#endif
-+}
-+
- int SyscallDispatcher::PerformStatat(const arch_seccomp_data& args,
-- bool arch64) {
-+ bool stat64) {
- if (static_cast<int>(args.args[0]) != AT_FDCWD)
- return -EPERM;
- // Only allow the AT_SYMLINK_NOFOLLOW flag which is used by some libc
-@@ -30,13 +40,29 @@ int SyscallDispatcher::PerformStatat(const arch_seccomp_data& args,
-
- const bool follow_links =
- !(static_cast<int>(args.args[3]) & AT_SYMLINK_NOFOLLOW);
-- if (arch64) {
-+ if (stat64) {
- return Stat64(reinterpret_cast<const char*>(args.args[1]), follow_links,
-- reinterpret_cast<struct stat64*>(args.args[2]));
-+ reinterpret_cast<struct kernel_stat64*>(args.args[2]));
- }
-
- return Stat(reinterpret_cast<const char*>(args.args[1]), follow_links,
-- reinterpret_cast<struct stat*>(args.args[2]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[2]));
-+}
-+
-+int SyscallDispatcher::PerformUnlinkat(const arch_seccomp_data& args) {
-+ if (static_cast<int>(args.args[0]) != AT_FDCWD)
-+ return -EPERM;
-+
-+ int flags = static_cast<int>(args.args[2]);
-+
-+ if (flags == AT_REMOVEDIR) {
-+ return Rmdir(reinterpret_cast<const char*>(args.args[1]));
-+ }
-+
-+ if (flags != 0)
-+ return -EPERM;
-+
-+ return Unlink(reinterpret_cast<const char*>(args.args[1]));
- }
-
- int SyscallDispatcher::DispatchSyscall(const arch_seccomp_data& args) {
-@@ -127,59 +153,42 @@ int SyscallDispatcher::DispatchSyscall(const arch_seccomp_data& args) {
- #if defined(__NR_stat)
- case __NR_stat:
- return Stat(reinterpret_cast<const char*>(args.args[0]), true,
-- reinterpret_cast<struct stat*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[1]));
- #endif
- #if defined(__NR_stat64)
- case __NR_stat64:
- return Stat64(reinterpret_cast<const char*>(args.args[0]), true,
-- reinterpret_cast<struct stat64*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat64*>(args.args[1]));
- #endif
- #if defined(__NR_lstat)
- case __NR_lstat:
- // See https://crbug.com/847096
- BROKER_UNPOISON_STRING(reinterpret_cast<const char*>(args.args[0]));
- return Stat(reinterpret_cast<const char*>(args.args[0]), false,
-- reinterpret_cast<struct stat*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[1]));
- #endif
- #if defined(__NR_lstat64)
- case __NR_lstat64:
- // See https://crbug.com/847096
- BROKER_UNPOISON_STRING(reinterpret_cast<const char*>(args.args[0]));
- return Stat64(reinterpret_cast<const char*>(args.args[0]), false,
-- reinterpret_cast<struct stat64*>(args.args[1]));
--#endif
--#if defined(__NR_fstatat)
-- case __NR_fstatat:
-- return PerformStatat(args, /*arch64=*/false);
-+ reinterpret_cast<struct kernel_stat64*>(args.args[1]));
- #endif
- #if defined(__NR_fstatat64)
- case __NR_fstatat64:
-- return PerformStatat(args, /*arch64=*/true);
-+ return PerformStatat(args, /*stat64=*/true);
- #endif
- #if defined(__NR_newfstatat)
- case __NR_newfstatat:
-- return PerformStatat(args, /*arch64=*/false);
-+ return PerformStatat(args, /*stat64=*/false);
- #endif
- #if defined(__NR_unlink)
- case __NR_unlink:
- return Unlink(reinterpret_cast<const char*>(args.args[0]));
- #endif
- #if defined(__NR_unlinkat)
-- case __NR_unlinkat: {
-- if (static_cast<int>(args.args[0]) != AT_FDCWD)
-- return -EPERM;
--
-- int flags = static_cast<int>(args.args[2]);
--
-- if (flags == AT_REMOVEDIR) {
-- return Rmdir(reinterpret_cast<const char*>(args.args[1]));
-- }
--
-- if (flags != 0)
-- return -EPERM;
--
-- return Unlink(reinterpret_cast<const char*>(args.args[1]));
-- }
-+ case __NR_unlinkat:
-+ return PerformUnlinkat(args);
- #endif // defined(__NR_unlinkat)
- default:
- RAW_CHECK(false);
-diff --git a/sandbox/linux/syscall_broker/syscall_dispatcher.h b/sandbox/linux/syscall_broker/syscall_dispatcher.h
-index d8b8874ad9ce4..1d6653caf3bd2 100644
---- a/sandbox/linux/syscall_broker/syscall_dispatcher.h
-+++ b/sandbox/linux/syscall_broker/syscall_dispatcher.h
-@@ -9,13 +9,15 @@
- #include <cstddef>
-
- #include "sandbox/linux/system_headers/linux_seccomp.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
-+#include "sandbox/sandbox_export.h"
-
- namespace sandbox {
- namespace syscall_broker {
-
- // An abstract class that defines all the system calls we perform for the
- // sandboxed process.
--class SyscallDispatcher {
-+class SANDBOX_EXPORT SyscallDispatcher {
- public:
- // Emulates access()/faccessat().
- // X_OK will always return an error in practice since the broker process
-@@ -40,19 +42,34 @@ class SyscallDispatcher {
- virtual int Rmdir(const char* path) const = 0;
-
- // Emulates stat()/stat64()/lstat()/lstat64()/fstatat()/newfstatat().
-+ // Stat64 is only available on 32-bit systems.
- virtual int Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const = 0;
-+ struct kernel_stat* sb) const = 0;
- virtual int Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const = 0;
-+ struct kernel_stat64* sb) const = 0;
-
- // Emulates unlink()/unlinkat().
- virtual int Unlink(const char* unlink) const = 0;
-
-+ // Different architectures use a different syscall from the stat family by
-+ // default in glibc. E.g. 32-bit systems use *stat*64() and fill out struct
-+ // kernel_stat64, whereas 64-bit systems use *stat*() and fill out struct
-+ // kernel_stat. Some tests want to call the SyscallDispatcher directly, and
-+ // should be using the default stat in order to test against glibc.
-+ int DefaultStatForTesting(const char* pathname,
-+ bool follow_links,
-+ default_stat_struct* sb);
-+
- // Validates the args passed to a *statat*() syscall and performs the syscall
-- // using Stat() or Stat64().
-- int PerformStatat(const arch_seccomp_data& args, bool arch64);
-+ // using Stat(), or on 32-bit systems it uses Stat64() for the *statat64()
-+ // syscalls.
-+ int PerformStatat(const arch_seccomp_data& args, bool stat64);
-+
-+ // Validates the args passed to an unlinkat() syscall and performs the syscall
-+ // using either Unlink() or Rmdir().
-+ int PerformUnlinkat(const arch_seccomp_data& args);
-
- // Reads the syscall number and arguments, imposes some policy (e.g. the *at()
- // system calls must only allow AT_FDCWD as the first argument), and
-diff --git a/sandbox/linux/system_headers/linux_stat.h b/sandbox/linux/system_headers/linux_stat.h
-new file mode 100644
-index 0000000000000..35788eb22a4e5
---- /dev/null
-+++ b/sandbox/linux/system_headers/linux_stat.h
-@@ -0,0 +1,188 @@
-+// Copyright 2021 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-+
-+#include <stdint.h>
-+
-+#include "build/build_config.h"
-+#include "sandbox/linux/system_headers/linux_syscalls.h"
-+
-+#if defined(ARCH_CPU_MIPS_FAMILY)
-+#if defined(ARCH_CPU_64_BITS)
-+struct kernel_stat {
-+#else
-+struct kernel_stat64 {
-+#endif
-+ unsigned st_dev;
-+ unsigned __pad0[3];
-+ unsigned long long st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned st_rdev;
-+ unsigned __pad1[3];
-+ long long st_size;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned st_blksize;
-+ unsigned __pad2;
-+ unsigned long long st_blocks;
-+};
-+#else
-+struct kernel_stat64 {
-+ unsigned long long st_dev;
-+ unsigned char __pad0[4];
-+ unsigned __st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned long long st_rdev;
-+ unsigned char __pad3[4];
-+ long long st_size;
-+ unsigned st_blksize;
-+ unsigned long long st_blocks;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned long long st_ino;
-+};
-+#endif
-+
-+#if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
-+struct kernel_stat {
-+ /* The kernel headers suggest that st_dev and st_rdev should be 32bit
-+ * quantities encoding 12bit major and 20bit minor numbers in an interleaved
-+ * format. In reality, we do not see useful data in the top bits. So,
-+ * we'll leave the padding in here, until we find a better solution.
-+ */
-+ unsigned short st_dev;
-+ short pad1;
-+ unsigned st_ino;
-+ unsigned short st_mode;
-+ unsigned short st_nlink;
-+ unsigned short st_uid;
-+ unsigned short st_gid;
-+ unsigned short st_rdev;
-+ short pad2;
-+ unsigned st_size;
-+ unsigned st_blksize;
-+ unsigned st_blocks;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned __unused4;
-+ unsigned __unused5;
-+};
-+#elif defined(__x86_64__)
-+struct kernel_stat {
-+ uint64_t st_dev;
-+ uint64_t st_ino;
-+ uint64_t st_nlink;
-+ unsigned st_mode;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned __pad0;
-+ uint64_t st_rdev;
-+ int64_t st_size;
-+ int64_t st_blksize;
-+ int64_t st_blocks;
-+ uint64_t st_atime_;
-+ uint64_t st_atime_nsec_;
-+ uint64_t st_mtime_;
-+ uint64_t st_mtime_nsec_;
-+ uint64_t st_ctime_;
-+ uint64_t st_ctime_nsec_;
-+ int64_t __unused4[3];
-+};
-+#elif (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+struct kernel_stat {
-+ unsigned st_dev;
-+ int st_pad1[3];
-+ unsigned st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned st_rdev;
-+ int st_pad2[2];
-+ long st_size;
-+ int st_pad3;
-+ long st_atime_;
-+ long st_atime_nsec_;
-+ long st_mtime_;
-+ long st_mtime_nsec_;
-+ long st_ctime_;
-+ long st_ctime_nsec_;
-+ int st_blksize;
-+ int st_blocks;
-+ int st_pad4[14];
-+};
-+#elif defined(__aarch64__)
-+struct kernel_stat {
-+ unsigned long st_dev;
-+ unsigned long st_ino;
-+ unsigned int st_mode;
-+ unsigned int st_nlink;
-+ unsigned int st_uid;
-+ unsigned int st_gid;
-+ unsigned long st_rdev;
-+ unsigned long __pad1;
-+ long st_size;
-+ int st_blksize;
-+ int __pad2;
-+ long st_blocks;
-+ long st_atime_;
-+ unsigned long st_atime_nsec_;
-+ long st_mtime_;
-+ unsigned long st_mtime_nsec_;
-+ long st_ctime_;
-+ unsigned long st_ctime_nsec_;
-+ unsigned int __unused4;
-+ unsigned int __unused5;
-+};
-+#endif
-+
-+// On 32-bit systems, we default to the 64-bit stat struct like libc
-+// implementations do. Otherwise we default to the normal stat struct which is
-+// already 64-bit.
-+// These defines make it easy to call the right syscall to fill out a 64-bit
-+// stat struct, which is the default in libc implementations but requires
-+// different syscall names on 32 and 64-bit platforms.
-+#if defined(__NR_fstatat64)
-+
-+namespace sandbox {
-+using default_stat_struct = struct kernel_stat64;
-+} // namespace sandbox
-+
-+#define __NR_fstatat_default __NR_fstatat64
-+#define __NR_fstat_default __NR_fstat64
-+
-+#elif defined(__NR_newfstatat)
-+
-+namespace sandbox {
-+using default_stat_struct = struct kernel_stat;
-+} // namespace sandbox
-+
-+#define __NR_fstatat_default __NR_newfstatat
-+#define __NR_fstat_default __NR_fstat
-+
-+#else
-+#error "one of fstatat64 and newfstatat must be defined"
-+#endif
-+
-+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-diff --git a/sandbox/linux/system_headers/linux_time.h b/sandbox/linux/system_headers/linux_time.h
-index 780f24dddd9fa..f18c806611f83 100644
---- a/sandbox/linux/system_headers/linux_time.h
-+++ b/sandbox/linux/system_headers/linux_time.h
-@@ -11,6 +11,32 @@
- #define CPUCLOCK_CLOCK_MASK 3
- #endif
-
-+#if !defined(CPUCLOCK_PROF)
-+#define CPUCLOCK_PROF 0
-+#endif
-+
-+#if !defined(CPUCLOCK_VIRT)
-+#define CPUCLOCK_VIRT 1
-+#endif
-+
-+#if !defined(CPUCLOCK_SCHED)
-+#define CPUCLOCK_SCHED 2
-+#endif
-+
-+#if !defined(CPUCLOCK_PERTHREAD_MASK)
-+#define CPUCLOCK_PERTHREAD_MASK 4
-+#endif
-+
-+#if !defined(MAKE_PROCESS_CPUCLOCK)
-+#define MAKE_PROCESS_CPUCLOCK(pid, clock) \
-+ ((int)(~(unsigned)(pid) << 3) | (int)(clock))
-+#endif
-+
-+#if !defined(MAKE_THREAD_CPUCLOCK)
-+#define MAKE_THREAD_CPUCLOCK(tid, clock) \
-+ ((int)(~(unsigned)(tid) << 3) | (int)((clock) | CPUCLOCK_PERTHREAD_MASK))
-+#endif
-+
- #if !defined(CLOCKFD)
- #define CLOCKFD 3
- #endif
-diff --git a/sandbox/linux/tests/test_utils.cc b/sandbox/linux/tests/test_utils.cc
-index 847c20b20c5d2..cf6041a4b476a 100644
---- a/sandbox/linux/tests/test_utils.cc
-+++ b/sandbox/linux/tests/test_utils.cc
-@@ -5,12 +5,14 @@
- #include "sandbox/linux/tests/test_utils.h"
-
- #include <errno.h>
-+#include <sys/mman.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
-
- #include "base/check_op.h"
-+#include "base/memory/page_size.h"
- #include "base/posix/eintr_wrapper.h"
-
- namespace sandbox {
-@@ -39,4 +41,17 @@ void TestUtils::HandlePostForkReturn(pid_t pid) {
- }
- }
-
-+void* TestUtils::MapPagesOrDie(size_t num_pages) {
-+ void* addr = mmap(nullptr, num_pages * base::GetPageSize(),
-+ PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-+ PCHECK(addr);
-+ return addr;
-+}
-+
-+void TestUtils::MprotectLastPageOrDie(char* addr, size_t num_pages) {
-+ size_t last_page_offset = (num_pages - 1) * base::GetPageSize();
-+ PCHECK(mprotect(addr + last_page_offset, base::GetPageSize(), PROT_NONE) >=
-+ 0);
-+}
-+
- } // namespace sandbox
-diff --git a/sandbox/linux/tests/test_utils.h b/sandbox/linux/tests/test_utils.h
-index 7cf9749fe4f1f..43b028b1e34ef 100644
---- a/sandbox/linux/tests/test_utils.h
-+++ b/sandbox/linux/tests/test_utils.h
-@@ -19,6 +19,8 @@ class TestUtils {
- // makes sure that if fork() succeeded the child exits
- // and the parent waits for it.
- static void HandlePostForkReturn(pid_t pid);
-+ static void* MapPagesOrDie(size_t num_pages);
-+ static void MprotectLastPageOrDie(char* addr, size_t num_pages);
-
- private:
- DISALLOW_IMPLICIT_CONSTRUCTORS(TestUtils);
-diff --git a/sandbox/policy/linux/bpf_broker_policy_linux.cc b/sandbox/policy/linux/bpf_broker_policy_linux.cc
-index 2963bb9ca8612..6dc8c0581b43c 100644
---- a/sandbox/policy/linux/bpf_broker_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_broker_policy_linux.cc
-@@ -93,8 +93,8 @@ ResultExpr BrokerProcessPolicy::EvaluateSyscall(int sysno) const {
- return Allow();
- break;
- #endif
--#if defined(__NR_fstatat)
-- case __NR_fstatat:
-+#if defined(__NR_fstatat64)
-+ case __NR_fstatat64:
- if (allowed_command_set_.test(syscall_broker::COMMAND_STAT))
- return Allow();
- break;
diff --git a/srcpkgs/chromium/patches/musl-stat.patch b/srcpkgs/chromium/patches/musl-stat.patch
new file mode 100644
index 000000000000..427be1a3f4c2
--- /dev/null
+++ b/srcpkgs/chromium/patches/musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/base/files/file.h.orig
++++ b/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+- defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++ defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++ (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch b/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
deleted file mode 100644
index d1db7e420154..000000000000
--- a/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/build/config/compiler/BUILD.gn.orig
-+++ b/build/config/compiler/BUILD.gn
-@@ -1620,10 +1620,6 @@
-
- # TODO(https://crbug.com/1050281): Clean up, enable.
- "-Wno-non-c-typedef-for-linkage",
--
-- # TODO(https://crbug.com/1203071): Clean up and enable.
-- "-Wno-unused-but-set-parameter",
-- "-Wno-unused-but-set-variable",
- ]
-
- cflags_c += [
diff --git a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..f0ce44c0a487
--- /dev/null
+++ b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
@@ -0,0 +1,66 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+---
+ build/config/compiler/BUILD.gn | 18 ++++++++++++------
+ build/config/compiler/compiler.gni | 7 ++-----
+ 2 files changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index ede07d111c..6db16c1cdd 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1216,12 +1216,19 @@ config("compiler_deterministic") {
+ # different build directory like "out/feature_a" and "out/feature_b" if
+ # we build same files with same compile flag.
+ # Other paths are already given in relative, no need to normalize them.
+- cflags += [
+- "-Xclang",
+- "-fdebug-compilation-dir",
+- "-Xclang",
+- ".",
+- ]
++ if (is_nacl) {
++ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
++ cflags += [
++ "-Xclang",
++ "-fdebug-compilation-dir",
++ "-Xclang",
++ ".",
++ ]
++ } else {
++ # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
++ # and -fcoverage-compilation-dir=.
++ cflags += [ "-ffile-compilation-dir=." ]
++ }
+ if (!is_win) {
+ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+ asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
+index 8c259c360a..642319b4f4 100644
+--- a/build/config/compiler/compiler.gni
++++ b/build/config/compiler/compiler.gni
+@@ -225,11 +225,8 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+- # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
+- # dependency to absolute path of source files.
+- !use_clang_coverage &&
+- (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+- is_chromeos || (is_apple && !enable_dsyms))
++ is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++ is_chromeos || (is_apple && !enable_dsyms)
+
+ # If the platform uses stripped absolute paths by default, then we don't expose
+ # it as a configuration option. If this is causing problems, please file a bug.
diff --git a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index a40ed9d5ac73..d109aeb5b95c 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -32,13 +32,13 @@ index 35f01d0a4..28f2e7475 100644
]
action_foreach("calculate_deb_dependencies") {
-@@ -315,7 +313,6 @@ group("installer_deps") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
":theme_files",
"//chrome",
"//chrome:packed_resources",
- "//chrome/browser/resources/media/mei_preload:component",
+ "//components/crash/core/app:chrome_crashpad_handler",
"//sandbox/linux:chrome_sandbox",
- "//third_party/crashpad/crashpad/handler:crashpad_handler",
]
diff --git a/sandbox/features.gni b/sandbox/features.gni
index db30ae6d6..9dc09bf53 100644
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 80823491366d..a26d99aa08a9 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=93.0.4577.82
+version=94.0.4606.61
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,13 +9,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=5d66214858fcba11a8f733d7a6fab61ed10e13e7df4ed37e63b66a0370fb2853
+checksum=6446db535c02c461c7e5c8d294a0300db03abba791f97f0c70bc52255aedb9bf
nocross=yes
lib32disabled=yes
build_options="clang debug js_optimize vaapi pulseaudio sndio pipewire"
-build_options_default="clang js_optimize vaapi pulseaudio sndio pipewire"
+build_options_default="clang js_optimize vaapi pulseaudio pipewire"
desc_option_clang="Use clang to build"
desc_option_debug="Build with debug symbols"
desc_option_js_optimize="Optimize the JS used for Chromium's UI"
@@ -24,7 +24,7 @@ desc_option_pulseaudio="Enable support for PulseAudio"
desc_option_sndio="Enable support for sndio"
desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
-hostmakedepends="$(vopt_if clang "clang lld") python pkgconf perl gperf bison ninja nodejs hwids
+hostmakedepends="$(vopt_if clang "clang lld llvm12") python pkgconf perl gperf bison ninja nodejs hwids
libatomic-devel libevent-devel libglib-devel $(vopt_if js_optimize openjdk)"
makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
@@ -43,8 +43,6 @@ case "$XBPS_TARGET_MACHINE" in
ppc64*-musl) makedepends+=" libucontext-devel" ;;
esac
-build_options_default="clang js_optimize vaapi pulseaudio pipewire"
-
post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
for f in "${FILESDIR}"/musl-patches/*.patch; do
@@ -77,6 +75,10 @@ post_patch() {
# prevent annoying errors when regenerating gni
vsed -i 's,^update_readme$,#update_readme,' \
third_party/libvpx/generate_gni.sh
+
+ # allow system dependencies in "official builds"
+ vsed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+ tools/generate_shim_headers/generate_shim_headers.py
}
do_configure() {
local system="" conf=()
@@ -167,6 +169,7 @@ do_configure() {
"is_clang=$(vopt_if clang true false)"
"use_lld=$(vopt_if clang true false)"
'clang_use_chrome_plugins=false'
+ 'clang_base_path="/usr"'
"gold_path=\"${XBPS_CROSS_BASE}/usr/bin/ld.gold\""
'use_custom_libcxx=false'
@@ -215,7 +218,15 @@ do_configure() {
# Save space by removing DLOG and DCHECK messages (about 6% reduction).
# 'logging_like_official_build=true'
- 'fieldtrial_testing_like_official_build=true'
+ 'disable_fieldtrial_testing_config=true'
+
+ 'is_official_build=true'
+
+ # segfaults with llvm-12.0.1
+ 'is_cfi=false'
+ 'use_thin_lto=false'
+ 'use_cfi_icall=false'
+ 'chrome_pgo_phase=0'
)
# this does not work on ppc64 yet
@@ -231,19 +242,32 @@ do_configure() {
ppc64*) conf+=( 'target_cpu="ppc64"' ) ;;
esac
+ if [ "$build_option_clang" ]; then
+ export CC=clang
+ export CXX=clang++
+ export AR=llvm-ar
+ export NM=llvm-nm
+ export CFLAGS="-Wno-unknown-warning-option"
+ export CXXFLAGS="-Wno-unknown-warning-option"
+ fi
+
out/Release/gn gen out/Release --args="${conf[*]}"
}
do_build() {
if [ "$build_option_clang" ]; then
export CC=clang
export CXX=clang++
+ export AR=llvm-ar
+ export NM=llvm-nm
+ export CFLAGS="-Wno-unknown-warning-option"
+ export CXXFLAGS="-Wno-unknown-warning-option"
fi
- ninja -C out/Release ${makejobs} chrome chromedriver mksnapshot crashpad_handler
+ ninja -C out/Release ${makejobs} chrome chromedriver mksnapshot chrome_crashpad_handler
}
do_install() {
vinstall out/Release/chrome 755 usr/lib/${pkgname} ${pkgname}
- vinstall out/Release/crashpad_handler 755 usr/lib/${pkgname} crashpad_handler
+ vinstall out/Release/chrome_crashpad_handler 755 usr/lib/${pkgname} chrome_crashpad_handler
vinstall out/Release/chromedriver 755 usr/lib/${pkgname} chromedriver
vinstall out/Release/libEGL.so 755 usr/lib/${pkgname} libEGL.so
vinstall out/Release/libGLESv2.so 755 usr/lib/${pkgname} libGLESv2.so
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 94.0.4606.54.
2021-09-24 20:27 [PR PATCH] chromium: update to 94.0.4606.54 Duncaen
2021-09-25 15:44 ` [PR PATCH] [Updated] " Duncaen
2021-09-25 15:49 ` Duncaen
@ 2021-09-25 16:09 ` Duncaen
2021-09-25 16:10 ` [PR PATCH] [Merged]: " Duncaen
3 siblings, 0 replies; 5+ messages in thread
From: Duncaen @ 2021-09-25 16:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-94
https://github.com/void-linux/void-packages/pull/33094
chromium: update to 94.0.4606.54.
[ci skip]
- [x] x86_64-glibc
- [x] x86_64-musl
- [x] i686
A patch file from https://github.com/void-linux/void-packages/pull/33094.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-94-33094.patch --]
[-- Type: text/x-diff, Size: 97588 bytes --]
From 7b272581e9ce52c164654df1b538c759b4092d10 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 24 Sep 2021 22:25:49 +0200
Subject: [PATCH] chromium: update to 94.0.4606.61.
---
.../files/musl-patches/no-mallinfo.patch | 13 +-
...e3dfcd0690df0e7b212fedcb95402f16935d.patch | 36 -
...14051210388bfcff605570d33f08cfa7bcaa.patch | 36 -
...c8b484c18c621d4b194635e41f171543f1df.patch | 42 -
...9ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch | 36 -
...5a1051551af26aaefc6fcd33502a51725396.patch | 36 -
srcpkgs/chromium/patches/9d080c0.patch | 196 +++
srcpkgs/chromium/patches/9d080c0.patch.args | 1 +
.../patches/chromium-90-ruy-include.patch | 24 -
.../patches/chromium-93-pdfium-include.patch | 117 --
.../chromium-94-CustomSpaces-include.patch | 24 +
.../patches/chromium-94-ffmpeg-roll.patch | 49 +
.../chromium-94-ffmpeg-roll.patch.args | 1 +
.../chromium/patches/chromium-webrtc-r0.patch | 33 -
.../linux-sandbox-fix-fstatat-crash.patch | 1384 -----------------
srcpkgs/chromium/patches/musl-stat.patch | 12 +
.../patches/remove-llvm13-warning-flags.patch | 13 -
.../patches/use-ffile-compilation-dir.patch | 66 +
.../use-ffile-compilation-dir.patch.args | 1 +
.../patches/xxx-ppc64le-support.patch | 4 +-
srcpkgs/chromium/template | 42 +-
21 files changed, 394 insertions(+), 1772 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
delete mode 100644 srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
delete mode 100644 srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
delete mode 100644 srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
delete mode 100644 srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
create mode 100644 srcpkgs/chromium/patches/9d080c0.patch
create mode 100644 srcpkgs/chromium/patches/9d080c0.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-90-ruy-include.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
create mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-webrtc-r0.patch
delete mode 100644 srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
create mode 100644 srcpkgs/chromium/patches/musl-stat.patch
delete mode 100644 srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
create mode 100644 srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
create mode 100644 srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 5fd3dc2b379c..2524cbb84ca9 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -53,12 +53,17 @@
result.max_rss_kb = res.ru_maxrss;
--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
+++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
-@@ -84,7 +84,7 @@
+@@ -86,11 +86,11 @@
}
-
+
size_t Process::GetMallocUsage() {
--#if defined(HAVE_MALLINFO)
-+#if defined(HAVE_MALLINFO) && defined(__GLIBC__)
+-#if defined(HAVE_MALLINFO2)
++#if defined(HAVE_MALLINFO2) && defined(__GLIBC__)
+ struct mallinfo2 mi;
+ mi = ::mallinfo2();
+ return mi.uordblks;
+-#elif defined(HAVE_MALLINFO)
++#elif defined(HAVE_MALLINFO) && defined(__GLIBC__)
struct mallinfo mi;
mi = ::mallinfo();
return mi.uordblks;
diff --git a/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch b/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
deleted file mode 100644
index c43da8dfd8ab..000000000000
--- a/srcpkgs/chromium/patches/17d0e3dfcd0690df0e7b212fedcb95402f16935d.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 17d0e3dfcd0690df0e7b212fedcb95402f16935d Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Fri, 23 Jul 2021 10:17:49 +0000
-Subject: [PATCH] IWYU: missing include for using std::vector in hash password
- manager.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build breakage:
-../../components/password_manager/core/browser/hash_password_manager.h:44:8: error: ‘vector’ in namespace ‘std’ does not name a template type
- 44 | std::vector<PasswordHashData> RetrieveAllPasswordHashes();
- | ^~~~~~
-
-Bug: 819294
-Change-Id: I8c8a4ec3972eedb87a312c5ec56adf4a21b1b2a2
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041046
-Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
-Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#904696}
----
- components/password_manager/core/browser/hash_password_manager.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/components/password_manager/core/browser/hash_password_manager.h b/components/password_manager/core/browser/hash_password_manager.h
-index c762c5a8c7713..85e656edcba11 100644
---- a/components/password_manager/core/browser/hash_password_manager.h
-+++ b/components/password_manager/core/browser/hash_password_manager.h
-@@ -6,6 +6,7 @@
- #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_HASH_PASSWORD_MANAGER_H_
-
- #include <string>
-+#include <vector>
-
- #include "base/callback.h"
- #include "base/callback_list.h"
diff --git a/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch b/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
deleted file mode 100644
index 8757eb5c36a9..000000000000
--- a/srcpkgs/chromium/patches/2f5514051210388bfcff605570d33f08cfa7bcaa.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2f5514051210388bfcff605570d33f08cfa7bcaa Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Wed, 21 Jul 2021 08:34:58 +0000
-Subject: [PATCH] IWYU: usage of unique_ptr requires including <memory> in
- bluetooth low energy scan filter.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build because of missing include:
-../../device/bluetooth/bluetooth_low_energy_scan_filter.h:57:15: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type
- 57 | static std::unique_ptr<BluetoothLowEnergyScanFilter> Create(
- | ^~~~~~~~~~
-
-Bug: 819294
-Change-Id: I347953a083f1bcdf744fd86e1a73954c6f86b32e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041155
-Reviewed-by: Reilly Grant <reillyg@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#903819}
----
- device/bluetooth/bluetooth_low_energy_scan_filter.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/device/bluetooth/bluetooth_low_energy_scan_filter.h b/device/bluetooth/bluetooth_low_energy_scan_filter.h
-index a0436c184a967..7ae606cca014e 100644
---- a/device/bluetooth/bluetooth_low_energy_scan_filter.h
-+++ b/device/bluetooth/bluetooth_low_energy_scan_filter.h
-@@ -7,6 +7,7 @@
-
- #include <stddef.h>
- #include <stdint.h>
-+#include <memory>
- #include <vector>
-
- #include "base/time/time.h"
diff --git a/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch b/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
deleted file mode 100644
index babfdb367660..000000000000
--- a/srcpkgs/chromium/patches/82e2c8b484c18c621d4b194635e41f171543f1df.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 82e2c8b484c18c621d4b194635e41f171543f1df Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Tue, 27 Jul 2021 08:09:39 +0000
-Subject: [PATCH] IWYU: usage of std::strcpy requires including cstring, in
- extension dialog auto confirm.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build breakage with libstdc++:
- ../../extensions/browser/extension_dialog_auto_confirm.cc: In destructor ‘extensions::ScopedTestDialogAutoConfirm::~ScopedTestDialogAutoConfirm()’:
- ../../extensions/browser/extension_dialog_auto_confirm.cc:43:8: error: ‘strcpy’ is not a member of ‘std’
- 43 | std::strcpy(g_extension_dialog_justification, old_justification_.c_str());
- | ^~~~~~
- ../../extensions/browser/extension_dialog_auto_confirm.cc: In member function ‘void extensions::ScopedTestDialogAutoConfirm::set_justification(const string&)’:
- ../../extensions/browser/extension_dialog_auto_confirm.cc:66:8: error: ‘strcpy’ is not a member of ‘std’
- 66 | std::strcpy(g_extension_dialog_justification, justification.c_str());
- | ^~~~~~
-
-Bug: 957519
-Change-Id: I313c38f22cab599fb8f0e4a339e8143af5bda3ee
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041001
-Reviewed-by: David Bertoni <dbertoni@chromium.org>
-Reviewed-by: Ben Wells <benwells@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#905634}
----
- extensions/browser/extension_dialog_auto_confirm.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/extensions/browser/extension_dialog_auto_confirm.cc b/extensions/browser/extension_dialog_auto_confirm.cc
-index adb4ac3f92ec8..be8b161bc1658 100644
---- a/extensions/browser/extension_dialog_auto_confirm.cc
-+++ b/extensions/browser/extension_dialog_auto_confirm.cc
-@@ -4,6 +4,7 @@
-
- #include "extensions/browser/extension_dialog_auto_confirm.h"
-
-+#include <cstring>
- #include <utility>
-
- #include "base/check.h"
diff --git a/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch b/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
deleted file mode 100644
index e51f76a4b3c0..000000000000
--- a/srcpkgs/chromium/patches/8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8ae99ee447cf5f0160ea4ae978cdf37f5dcecd1e Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Wed, 21 Jul 2021 08:36:20 +0000
-Subject: [PATCH] IWYU: missing memory include for unique_ptr usage in
- class_property.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix GCC build breakage because of missing inclide:
-./../ui/base/class_property.h:120:58: error: ‘std::unique_ptr’ has not been declared
- 120 | T* SetProperty(const ClassProperty<T*>* property, std::unique_ptr<T> value);
- | ^~~~~~~~~~
-
-Bug: 819294
-Change-Id: I46b921876702b8d44674689bbb5acdc107db21e5
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041030
-Reviewed-by: Peter Boström <pbos@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#903820}
----
- ui/base/class_property.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ui/base/class_property.h b/ui/base/class_property.h
-index f7b2f559858b7..88b49386ae0ad 100644
---- a/ui/base/class_property.h
-+++ b/ui/base/class_property.h
-@@ -8,6 +8,7 @@
- #include <stdint.h>
-
- #include <map>
-+#include <memory>
- #include <set>
- #include <type_traits>
-
diff --git a/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch b/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
deleted file mode 100644
index bab64a814b2f..000000000000
--- a/srcpkgs/chromium/patches/9c675a1051551af26aaefc6fcd33502a51725396.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9c675a1051551af26aaefc6fcd33502a51725396 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Mon, 26 Jul 2021 17:14:51 +0000
-Subject: [PATCH] IWYU: missing include for std::vector usage in devtools
- embedded message dispatcher.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix GCC build breakage:
- ../../chrome/browser/devtools/devtools_embedder_message_dispatcher.h:116:36: error: ‘vector’ in namespace ‘std’ does not name a template type
- 116 | const std::vector<base::Value>& params) = 0;
- | ^~~~~~
-
-Bug: 819294
-Change-Id: I379bf14416c3bfd3c0cdac7bb2542b79781261ec
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041156
-Reviewed-by: Joe Mason <joenotcharles@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/master@{#905300}
----
- chrome/browser/devtools/devtools_embedder_message_dispatcher.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-index 12f8500b7811d..4007112f39410 100644
---- a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-+++ b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
-@@ -8,6 +8,7 @@
- #include <map>
- #include <memory>
- #include <string>
-+#include <vector>
-
- #include "base/callback.h"
- #include "ui/gfx/geometry/insets.h"
diff --git a/srcpkgs/chromium/patches/9d080c0.patch b/srcpkgs/chromium/patches/9d080c0.patch
new file mode 100644
index 000000000000..885ab5a1b82a
--- /dev/null
+++ b/srcpkgs/chromium/patches/9d080c0.patch
@@ -0,0 +1,196 @@
+From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001
+From: Dylan Cutler <dylancutler@google.com>
+Date: Wed, 26 May 2021 16:39:52 +0000
+Subject: [PATCH] Reland "Replace 'blacklist' with 'ignorelist' in
+ ./tools/msan/."
+
+This is a reland of 3b6263f2eece1264b052dfdcbc03b851d5abfb48
+
+Relanding now that https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2897974 is merged
+
+Original change's description:
+> Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+>
+> Bug: 1097272, 1097268
+> Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+> Commit-Queue: Dylan Cutler <dylancutler@google.com>
+> Reviewed-by: Nico Weber <thakis@chromium.org>
+> Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+> Cr-Commit-Position: refs/heads/master@{#883035}
+
+Bug: 1097272
+Bug: 1097268
+Change-Id: I11a5bc8972680c95fb1dab95ed3b707ed76f4667
+Cq-Include-Trybots: luci.chromium.try:chromeos-amd64-generic-cfi-thin-lto-rel
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2911096
+Commit-Queue: Dylan Cutler <dylancutler@google.com>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#886773}
+---
+ build/config/sanitizers/BUILD.gn | 44 ++++++++++----------
+ build_overrides/build.gni | 14 +++----
+ tools/msan/{blacklist.txt => ignorelist.txt} | 0
+ 3 files changed, 29 insertions(+), 29 deletions(-)
+ rename tools/msan/{blacklist.txt => ignorelist.txt} (100%)
+
+diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn
+index aaaad023474d1..55b388a437439 100644
+--- a/build/config/sanitizers/BUILD.gn
++++ b/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+ if (is_asan) {
+ cflags += [ "-fsanitize=address" ]
+ if (is_win) {
+- if (!defined(asan_win_blacklist_path)) {
+- asan_win_blacklist_path =
++ if (!defined(asan_win_blocklist_path)) {
++ asan_win_blocklist_path =
+ rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+ }
+- cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
++ cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
+ }
+ }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+ cflags = []
+ if (is_cfi && current_toolchain == default_toolchain) {
+- if (!defined(cfi_blacklist_path)) {
+- cfi_blacklist_path =
++ if (!defined(cfi_ignorelist_path)) {
++ cfi_ignorelist_path =
+ rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+ }
+ cflags += [
+ "-fsanitize=cfi-vcall",
+- "-fsanitize-blacklist=$cfi_blacklist_path",
++ "-fsanitize-ignorelist=$cfi_ignorelist_path",
+ ]
+
+ if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+ if (is_msan) {
+ assert(is_linux || is_chromeos,
+ "msan only supported on linux x86_64/ChromeOS")
+- if (!defined(msan_blacklist_path)) {
+- msan_blacklist_path =
+- rebase_path("//tools/msan/blacklist.txt", root_build_dir)
++ if (!defined(msan_ignorelist_path)) {
++ msan_ignorelist_path =
++ rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=memory",
+ "-fsanitize-memory-track-origins=$msan_track_origins",
+- "-fsanitize-blacklist=$msan_blacklist_path",
++ "-fsanitize-ignorelist=$msan_ignorelist_path",
+ ]
+ }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+ if (is_tsan) {
+ assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+- if (!defined(tsan_blacklist_path)) {
+- tsan_blacklist_path =
++ if (!defined(tsan_ignorelist_path)) {
++ tsan_ignorelist_path =
+ rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=thread",
+- "-fsanitize-blacklist=$tsan_blacklist_path",
++ "-fsanitize-ignorelist=$tsan_ignorelist_path",
+ ]
+ }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+ cflags = []
+ if (is_ubsan) {
+- if (!defined(ubsan_blacklist_path)) {
+- ubsan_blacklist_path =
++ if (!defined(ubsan_ignorelist_path)) {
++ ubsan_ignorelist_path =
+ rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+ }
+ cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+ "-fsanitize=signed-integer-overflow",
+ "-fsanitize=unreachable",
+ "-fsanitize=vla-bound",
+- "-fsanitize-blacklist=$ubsan_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_ignorelist_path",
+ ]
+
+ # Chromecast ubsan builds fail to compile with these
+@@ -486,8 +486,8 @@ config("ubsan_no_recover") {
+
+ config("ubsan_security_flags") {
+ if (is_ubsan_security) {
+- if (!defined(ubsan_security_blacklist_path)) {
+- ubsan_security_blacklist_path =
++ if (!defined(ubsan_security_ignorelist_path)) {
++ ubsan_security_ignorelist_path =
+ rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+@@ -495,7 +495,7 @@ config("ubsan_security_flags") {
+ "-fsanitize=shift",
+ "-fsanitize=signed-integer-overflow",
+ "-fsanitize=vla-bound",
+- "-fsanitize-blacklist=$ubsan_security_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
+ ]
+ }
+ }
+@@ -508,13 +508,13 @@ config("ubsan_null_flags") {
+
+ config("ubsan_vptr_flags") {
+ if (is_ubsan_vptr) {
+- if (!defined(ubsan_vptr_blacklist_path)) {
+- ubsan_vptr_blacklist_path =
++ if (!defined(ubsan_vptr_ignorelist_path)) {
++ ubsan_vptr_ignorelist_path =
+ rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+ }
+ cflags = [
+ "-fsanitize=vptr",
+- "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
++ "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
+ ]
+ }
+ }
+diff --git a/build_overrides/build.gni b/build_overrides/build.gni
+index 82627b03653f1..f3e563ab701bf 100644
+--- a/build_overrides/build.gni
++++ b/build_overrides/build.gni
+@@ -42,15 +42,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_blacklist_path = "path/to/tsan/ignores.txt"
+-# msan_blacklist_path = "path/to/msan/blacklist.txt"
+-# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
+-# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
+-# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
+-# cfi_blacklist_path = "path/to/cfi/ignores.txt"
++# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
++# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
++# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
++# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
++# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
++# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
+
+ declare_args() {
+ # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
+diff --git a/tools/msan/blacklist.txt b/tools/msan/ignorelist.txt
+similarity index 100%
+rename from tools/msan/blacklist.txt
+rename to tools/msan/ignorelist.txt
diff --git a/srcpkgs/chromium/patches/9d080c0.patch.args b/srcpkgs/chromium/patches/9d080c0.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/9d080c0.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/chromium-90-ruy-include.patch b/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
deleted file mode 100644
index 81d5367807be..000000000000
--- a/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Thu, 4 Mar 2021 15:05:46 +0000
-Subject: [PATCH] IWYU: include limits for std::numeric_limits
-
----
- third_party/ruy/src/ruy/block_map.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/ruy/src/ruy/block_map.cc b/third_party/ruy/src/ruy/block_map.cc
-index 44e5039..a7a7559 100644
---- a/third_party/ruy/src/ruy/block_map.cc
-+++ b/third_party/ruy/src/ruy/block_map.cc
-@@ -17,6 +17,7 @@ limitations under the License.
-
- #include <algorithm>
- #include <cstdint>
-+#include <limits>
-
- #ifdef RUY_MAKEBLOCKMAP_DEBUG
- #include <cstdio>
---
-2.26.2
-
diff --git a/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch b/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
deleted file mode 100644
index 72f2abd3e7a6..000000000000
--- a/srcpkgs/chromium/patches/chromium-93-pdfium-include.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 7a6289c5ace52cf88f0e19caa5f78b7c15d0e7a6 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.co.uk>
-Date: Wed, 21 Jul 2021 17:42:30 +0000
-Subject: [PATCH] fxcodec, fxge: fix missing includes with libstdc++
-
-These missing includes break the build with gcc/libstdc++, they were not
-a problem in practice with clang/libc++.
-
-Change-Id: I40013f97ba7ab06f32aa59f87b04aec06a19478c
-Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83210
-Commit-Queue: Lei Zhang <thestig@chromium.org>
-Reviewed-by: Lei Zhang <thestig@chromium.org>
----
-
-diff --git a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-index cea0679..036f250 100644
---- a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-+++ b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
-@@ -7,6 +7,7 @@
- #include "core/fxcodec/jpeg/jpegmodule.h"
-
- #include <setjmp.h>
-+#include <string.h>
-
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-index c66985a..9c1122b 100644
---- a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-+++ b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxcodec/jpx/cjpx_decoder.h"
-
-+#include <string.h>
-+
- #include <algorithm>
- #include <limits>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-index 5369d52..d198852 100644
---- a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-+++ b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/cfx_cliprgn.h"
-
-+#include <string.h>
-+
- #include <utility>
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-index 6f9b420..0f1ffae 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_bitmapcomposer.h"
-
-+#include <string.h>
-+
- #include "core/fxge/cfx_cliprgn.h"
- #include "core/fxge/dib/cfx_dibitmap.h"
-
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-index f57c00e..45a0a18 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_bitmapstorer.h"
-
-+#include <string.h>
-+
- #include <utility>
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-index 4ec0ddb..a1de2fb 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_dibbase.h"
-
-+#include <string.h>
-+
- #include <algorithm>
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-index d7ccf6c..94e8acc 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_dibitmap.h"
-
-+#include <string.h>
-+
- #include <limits>
- #include <memory>
- #include <utility>
-diff --git a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-index e8362d7..c04c6dc 100644
---- a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-+++ b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
-@@ -6,6 +6,8 @@
-
- #include "core/fxge/dib/cfx_scanlinecompositor.h"
-
-+#include <string.h>
-+
- #include <algorithm>
-
- #include "core/fxge/dib/fx_dib.h"
diff --git a/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch b/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
new file mode 100644
index 000000000000..01757758c1e2
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-CustomSpaces-include.patch
@@ -0,0 +1,24 @@
+From 4eeacdaa57b29a079fe09315eb22557c06aa522e Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 13 Aug 2021 12:57:42 +0000
+Subject: [PATCH] IWYU: add memory for std::unique_ptr in blink::CustomSpaces
+
+---
+ .../blink/renderer/platform/heap/v8_wrapper/custom_spaces.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
+index df0465a..640cb33 100644
+--- a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
++++ b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
+@@ -5,6 +5,7 @@
+ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
+ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
+
++#include <memory>
+ #include <vector>
+
+ #include "third_party/blink/renderer/platform/platform_export.h"
+--
+2.31.1
+
diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
new file mode 100644
index 000000000000..68f26364eda7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
@@ -0,0 +1,49 @@
+From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001
+From: "liberato@chromium.org" <liberato@chromium.org>
+Date: Fri, 6 Aug 2021 04:25:31 +0000
+Subject: [PATCH] FFmpeg M94 roll.
+
+Contains DEPS update + chromium-side fixes.
+
+Bug: 1227259
+Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889
+Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
+Commit-Queue: Frank Liberato <liberato@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#909174}
+---
+ media/ffmpeg/ffmpeg_common.h | 1 +
+ media/filters/ffmpeg_demuxer.cc | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
+index cede8ac5a7..97d6307e28 100644
+--- a/media/ffmpeg/ffmpeg_common.h
++++ b/media/ffmpeg/ffmpeg_common.h
+@@ -29,6 +29,7 @@ extern "C" {
+ #include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
++#include <libavutil/channel_layout.h>
+ #include <libavutil/imgutils.h>
+ #include <libavutil/log.h>
+ #include <libavutil/mastering_display_metadata.h>
+diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
+index ac4713b072..605001d935 100644
+--- a/media/filters/ffmpeg_demuxer.cc
++++ b/media/filters/ffmpeg_demuxer.cc
+@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
+
+ // Next try to use the first DTS value, for codecs where we know PTS == DTS
+ // (excludes all H26x codecs). The start time must be returned in PTS.
+- if (stream->first_dts != kNoFFmpegTimestamp &&
++ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
+ stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
+ stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
+ stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
+ const base::TimeDelta first_pts =
+- ConvertFromTimeBase(stream->time_base, stream->first_dts);
++ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
+ if (first_pts < start_time)
+ start_time = first_pts;
+ }
diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/chromium-webrtc-r0.patch b/srcpkgs/chromium/patches/chromium-webrtc-r0.patch
deleted file mode 100644
index 67574f6d540c..000000000000
--- a/srcpkgs/chromium/patches/chromium-webrtc-r0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream: Yes, https://webrtc-review.googlesource.com/9384
-Reason: Fixes musl builds of webrtc
-
-From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Fri, 13 Oct 2017 15:49:32 +0200
-Subject: [PATCH] IWYU: Include math.h for round(3).
-
-math.h was being implicitly included, which can break the build with
-alternative libc implementations.
-
-Bug: None
-Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
-Reviewed-on: https://webrtc-review.googlesource.com/9384
-Reviewed-by: Tommi <tommi@webrtc.org>
-Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
-Cr-Commit-Position: refs/heads/master@{#20292}
----
-
---- a/third_party/webrtc/p2p/base/port.cc
-+++ b/third_party/webrtc/p2p/base/port.cc
-@@ -10,6 +10,8 @@
-
- #include "p2p/base/port.h"
-
-+#include <math.h>
-+
- #include <algorithm>
- #include <vector>
-
---
-2.15.0.rc2
-
diff --git a/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch b/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
deleted file mode 100644
index 4a99f1de2874..000000000000
--- a/srcpkgs/chromium/patches/linux-sandbox-fix-fstatat-crash.patch
+++ /dev/null
@@ -1,1384 +0,0 @@
-From 4b438323d68840453b5ef826c3997568e2e0e8c7 Mon Sep 17 00:00:00 2001
-From: Matthew Denton <mpdenton@chromium.org>
-Date: Mon, 19 Jul 2021 14:03:13 +0000
-Subject: [PATCH] Reland "Reland "Linux sandbox syscall broker: use struct
- kernel_stat""
-
-This reverts commit ff277a52ece0b216617d770f201ed66955fe70b9.
-
-Reason for revert: reland
-
-The fix included in the reland is that fstatat64() needs to be
-allowed in the broker process's seccomp policy.
-
-This CL also includes some extra tests that the kernel_stat structures
-match the layout the kernel expects.
-
-Bug: 1164975, 1199431
-Test: trogdor Chromebook successfully boots and allows login.
-
-Original change's description:
-> Revert "Reland "Linux sandbox syscall broker: use struct kernel_stat""
->
-> This reverts commit cffbc4432af79f720ae3c75dff380b853701bd64.
->
-> Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1199431
->
-> Original change's description:
-> > Reland "Linux sandbox syscall broker: use struct kernel_stat"
-> >
-> > This reverts commit 23030dc650cdfa22631f25bef937905f27f06a2c.
-> >
-> > Original change's description:
-> > > Revert "Linux sandbox syscall broker: use struct kernel_stat"
-> > >
-> > > This reverts commit 784b0fcd8a3ca6bcd3acb9cfd624ec9cbbac2789.
-> > >
-> > > Reason for revert: Causing failure in
-> > > Step "sandbox_linux_unittests" failing on builder "Linux ChromiumOS MSan Tests"
-> > > See crbug.com/1198480
-> > >
-> > > Original change's description:
-> > > > Linux sandbox syscall broker: use struct kernel_stat
-> > > >
-> > > > The struct stat used in libc is different (in size and field ordering)
-> > > > from the structure assumed by the Linux kernel. So, when emulating
-> > > > system calls, we need to use the struct definition the kernel expects.
-> > > >
-> > > > This CL adds linux_stat.h that includes definitions of the different
-> > > > kernel structs.
-> > > >
-> > > > Change-Id: I53cad35c2251dff0f6b7ea77528cfa58ef3cab4a
-> > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2780876
-> > > > Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> > > > Reviewed-by: Robert Sesek <rsesek@chromium.org>
-> > > > Cr-Commit-Position: refs/heads/master@{#871767}
-> > >
-> > > Change-Id: Icbec38f2103c8424dec79ab1870b97c3e83f9361
-> > > No-Presubmit: true
-> > > No-Tree-Checks: true
-> > > No-Try: true
-> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2821812
-> > > Auto-Submit: Victor Vianna <victorvianna@google.com>
-> > > Owners-Override: Victor Vianna <victorvianna@google.com>
-> > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-> > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-> > > Cr-Commit-Position: refs/heads/master@{#871882}
-> >
-> > Change-Id: I1f39bb5242961474def594ff7dbea52009f2cee4
-> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2824115
-> > Auto-Submit: Matthew Denton <mpdenton@chromium.org>
-> > Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> > Reviewed-by: Robert Sesek <rsesek@chromium.org>
-> > Cr-Commit-Position: refs/heads/master@{#872812}
->
-> Fixed: 1199431
-> Change-Id: Iebfc0c48201bf22ff9c54d8d5c8a43d26a880098
-> No-Presubmit: true
-> No-Tree-Checks: true
-> No-Try: true
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2830459
-> Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
-> Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-> Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
-> Reviewed-by: Matthew Denton <mpdenton@chromium.org>
-> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
-> Owners-Override: Kinuko Yasuda <kinuko@chromium.org>
-> Cr-Commit-Position: refs/heads/master@{#873173}
-
-Change-Id: Ibe6a485070f33489aaa157b51b908c2d23d174d7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2848936
-Reviewed-by: Robert Sesek <rsesek@chromium.org>
-Commit-Queue: Matthew Denton <mpdenton@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#902981}
----
- sandbox/linux/BUILD.gn | 1 +
- .../seccomp_broker_process_unittest.cc | 40 +++-
- sandbox/linux/seccomp-bpf-helpers/DEPS | 1 -
- ...scall_parameters_restrictions_unittests.cc | 4 -
- sandbox/linux/services/syscall_wrappers.cc | 50 ++++-
- sandbox/linux/services/syscall_wrappers.h | 15 ++
- .../services/syscall_wrappers_unittest.cc | 129 +++++++++++-
- sandbox/linux/syscall_broker/DEPS | 3 +-
- sandbox/linux/syscall_broker/broker_client.cc | 4 +-
- sandbox/linux/syscall_broker/broker_client.h | 4 +-
- sandbox/linux/syscall_broker/broker_host.cc | 23 ++-
- .../syscall_broker/broker_process_unittest.cc | 74 +++----
- .../remote_syscall_arg_handler_unittest.cc | 36 ++--
- .../syscall_broker/syscall_dispatcher.cc | 67 ++++---
- .../linux/syscall_broker/syscall_dispatcher.h | 27 ++-
- sandbox/linux/system_headers/linux_stat.h | 188 ++++++++++++++++++
- sandbox/linux/system_headers/linux_time.h | 26 +++
- sandbox/linux/tests/test_utils.cc | 15 ++
- sandbox/linux/tests/test_utils.h | 2 +
- .../policy/linux/bpf_broker_policy_linux.cc | 4 +-
- 20 files changed, 595 insertions(+), 118 deletions(-)
- create mode 100644 sandbox/linux/system_headers/linux_stat.h
-
-diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
-index 2f778dd0bcab2..ccbbc91716e71 100644
---- a/sandbox/linux/BUILD.gn
-+++ b/sandbox/linux/BUILD.gn
-@@ -443,6 +443,7 @@ source_set("sandbox_services_headers") {
- "system_headers/linux_ptrace.h",
- "system_headers/linux_seccomp.h",
- "system_headers/linux_signal.h",
-+ "system_headers/linux_stat.h",
- "system_headers/linux_syscalls.h",
- "system_headers/linux_time.h",
- "system_headers/linux_ucontext.h",
-diff --git a/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc b/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-index 9da9c68911428..8a941983b198d 100644
---- a/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-+++ b/sandbox/linux/integration_tests/seccomp_broker_process_unittest.cc
-@@ -34,6 +34,7 @@
- #include "sandbox/linux/syscall_broker/broker_file_permission.h"
- #include "sandbox/linux/syscall_broker/broker_process.h"
- #include "sandbox/linux/system_headers/linux_seccomp.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
- #include "sandbox/linux/tests/scoped_temporary_file.h"
- #include "sandbox/linux/tests/test_utils.h"
-@@ -202,6 +203,26 @@ namespace {
- // not accept this as a valid error number. E.g. bionic accepts up to 255, glibc
- // and musl up to 4096.
- const int kFakeErrnoSentinel = 254;
-+
-+void ConvertKernelStatToLibcStat(default_stat_struct& in_stat,
-+ struct stat& out_stat) {
-+ out_stat.st_dev = in_stat.st_dev;
-+ out_stat.st_ino = in_stat.st_ino;
-+ out_stat.st_mode = in_stat.st_mode;
-+ out_stat.st_nlink = in_stat.st_nlink;
-+ out_stat.st_uid = in_stat.st_uid;
-+ out_stat.st_gid = in_stat.st_gid;
-+ out_stat.st_rdev = in_stat.st_rdev;
-+ out_stat.st_size = in_stat.st_size;
-+ out_stat.st_blksize = in_stat.st_blksize;
-+ out_stat.st_blocks = in_stat.st_blocks;
-+ out_stat.st_atim.tv_sec = in_stat.st_atime_;
-+ out_stat.st_atim.tv_nsec = in_stat.st_atime_nsec_;
-+ out_stat.st_mtim.tv_sec = in_stat.st_mtime_;
-+ out_stat.st_mtim.tv_nsec = in_stat.st_mtime_nsec_;
-+ out_stat.st_ctim.tv_sec = in_stat.st_ctime_;
-+ out_stat.st_ctim.tv_nsec = in_stat.st_ctime_nsec_;
-+}
- } // namespace
-
- // There are a variety of ways to make syscalls in a sandboxed process. One is
-@@ -217,6 +238,10 @@ class Syscaller {
-
- virtual int Open(const char* filepath, int flags) = 0;
- virtual int Access(const char* filepath, int mode) = 0;
-+ // NOTE: we use struct stat instead of default_stat_struct, to make the libc
-+ // syscaller simpler. Copying from default_stat_struct (the structure returned
-+ // from a stat sycall) to struct stat (the structure exposed by a libc to its
-+ // users) is simpler than going in the opposite direction.
- virtual int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) = 0;
-@@ -243,8 +268,12 @@ class IPCSyscaller : public Syscaller {
- int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) override {
-- return broker_->GetBrokerClientSignalBased()->Stat(filepath, follow_links,
-- statbuf);
-+ default_stat_struct buf;
-+ int ret = broker_->GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ filepath, follow_links, &buf);
-+ if (ret >= 0)
-+ ConvertKernelStatToLibcStat(buf, *statbuf);
-+ return ret;
- }
-
- int Rename(const char* oldpath, const char* newpath) override {
-@@ -300,10 +329,13 @@ class DirectSyscaller : public Syscaller {
- int Stat(const char* filepath,
- bool follow_links,
- struct stat* statbuf) override {
-- int ret = follow_links ? syscall(__NR_stat, filepath, statbuf)
-- : syscall(__NR_lstat, filepath, statbuf);
-+ struct kernel_stat buf;
-+ int ret = syscall(__NR_newfstatat, AT_FDCWD, filepath, &buf,
-+ follow_links ? 0 : AT_SYMLINK_NOFOLLOW);
- if (ret < 0)
- return -errno;
-+
-+ ConvertKernelStatToLibcStat(buf, *statbuf);
- return ret;
- }
-
-diff --git a/sandbox/linux/seccomp-bpf-helpers/DEPS b/sandbox/linux/seccomp-bpf-helpers/DEPS
-index 4419fd1da34e8..95d1bb6cbbabf 100644
---- a/sandbox/linux/seccomp-bpf-helpers/DEPS
-+++ b/sandbox/linux/seccomp-bpf-helpers/DEPS
-@@ -3,5 +3,4 @@ include_rules = [
- "+sandbox/linux/seccomp-bpf",
- "+sandbox/linux/services",
- "+sandbox/linux/system_headers",
-- "+third_party/lss/linux_syscall_support.h",
- ]
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-index 903e702eab14b..76c393032c1fe 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-@@ -37,10 +37,6 @@
- #include "sandbox/linux/system_headers/linux_time.h"
- #include "sandbox/linux/tests/unit_tests.h"
-
--#if !defined(OS_ANDROID)
--#include "third_party/lss/linux_syscall_support.h" // for MAKE_PROCESS_CPUCLOCK
--#endif
--
- namespace sandbox {
-
- namespace {
-diff --git a/sandbox/linux/services/syscall_wrappers.cc b/sandbox/linux/services/syscall_wrappers.cc
-index fcfd2aa129d4b..3bec18a14e91e 100644
---- a/sandbox/linux/services/syscall_wrappers.cc
-+++ b/sandbox/linux/services/syscall_wrappers.cc
-@@ -4,6 +4,7 @@
-
- #include "sandbox/linux/services/syscall_wrappers.h"
-
-+#include <fcntl.h>
- #include <pthread.h>
- #include <sched.h>
- #include <setjmp.h>
-@@ -14,11 +15,13 @@
- #include <unistd.h>
- #include <cstring>
-
-+#include "base/check.h"
- #include "base/compiler_specific.h"
- #include "base/logging.h"
- #include "build/build_config.h"
- #include "sandbox/linux/system_headers/capability.h"
- #include "sandbox/linux/system_headers/linux_signal.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
-
- namespace sandbox {
-@@ -217,7 +220,7 @@ asm(
- #undef STR
- #undef XSTR
-
--#endif
-+#endif // defined(ARCH_CPU_X86_FAMILY)
-
- int sys_sigaction(int signum,
- const struct sigaction* act,
-@@ -241,7 +244,7 @@ int sys_sigaction(int signum,
- #error "Unsupported architecture."
- #endif
- }
--#endif
-+#endif // defined(ARCH_CPU_X86_FAMILY)
- }
-
- LinuxSigAction linux_oldact = {};
-@@ -259,6 +262,47 @@ int sys_sigaction(int signum,
- return result;
- }
-
--#endif // defined(MEMORY_SANITIZER)
-+#endif // !defined(OS_NACL_NONSFI)
-+
-+int sys_stat(const char* path, struct kernel_stat* stat_buf) {
-+ int res;
-+#if !defined(__NR_stat)
-+ res = syscall(__NR_newfstatat, AT_FDCWD, path, stat_buf, 0);
-+#else
-+ res = syscall(__NR_stat, path, stat_buf);
-+#endif
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+}
-+
-+int sys_lstat(const char* path, struct kernel_stat* stat_buf) {
-+ int res;
-+#if !defined(__NR_lstat)
-+ res = syscall(__NR_newfstatat, AT_FDCWD, path, stat_buf, AT_SYMLINK_NOFOLLOW);
-+#else
-+ res = syscall(__NR_lstat, path, stat_buf);
-+#endif
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+}
-+
-+int sys_fstatat64(int dirfd,
-+ const char* pathname,
-+ struct kernel_stat64* stat_buf,
-+ int flags) {
-+#if defined(__NR_fstatat64)
-+ int res = syscall(__NR_fstatat64, dirfd, pathname, stat_buf, flags);
-+ if (res == 0)
-+ MSAN_UNPOISON(stat_buf, sizeof(*stat_buf));
-+ return res;
-+#else // defined(__NR_fstatat64)
-+ // We should not reach here on 64-bit systems, as the *stat*64() are only
-+ // necessary on 32-bit.
-+ RAW_CHECK(false);
-+ return -ENOSYS;
-+#endif
-+}
-
- } // namespace sandbox
-diff --git a/sandbox/linux/services/syscall_wrappers.h b/sandbox/linux/services/syscall_wrappers.h
-index 1975bfbd88a6d..b55340e4a26b7 100644
---- a/sandbox/linux/services/syscall_wrappers.h
-+++ b/sandbox/linux/services/syscall_wrappers.h
-@@ -17,6 +17,8 @@ struct sock_fprog;
- struct rlimit64;
- struct cap_hdr;
- struct cap_data;
-+struct kernel_stat;
-+struct kernel_stat64;
-
- namespace sandbox {
-
-@@ -84,6 +86,19 @@ SANDBOX_EXPORT int sys_sigaction(int signum,
- const struct sigaction* act,
- struct sigaction* oldact);
-
-+// Some architectures do not have stat() and lstat() syscalls. In that case,
-+// these wrappers will use newfstatat(), which is available on all other
-+// architectures, with the same capabilities as stat() and lstat().
-+SANDBOX_EXPORT int sys_stat(const char* path, struct kernel_stat* stat_buf);
-+SANDBOX_EXPORT int sys_lstat(const char* path, struct kernel_stat* stat_buf);
-+
-+// Takes care of unpoisoning |stat_buf| for MSAN. Check-fails if fstatat64() is
-+// not a supported syscall on the current platform.
-+SANDBOX_EXPORT int sys_fstatat64(int dirfd,
-+ const char* pathname,
-+ struct kernel_stat64* stat_buf,
-+ int flags);
-+
- } // namespace sandbox
-
- #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
-diff --git a/sandbox/linux/services/syscall_wrappers_unittest.cc b/sandbox/linux/services/syscall_wrappers_unittest.cc
-index 32820f60a8cee..64b9cea80f319 100644
---- a/sandbox/linux/services/syscall_wrappers_unittest.cc
-+++ b/sandbox/linux/services/syscall_wrappers_unittest.cc
-@@ -5,15 +5,19 @@
- #include "sandbox/linux/services/syscall_wrappers.h"
-
- #include <stdint.h>
-+#include <string.h>
- #include <sys/syscall.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
--#include <cstring>
-
-+#include "base/logging.h"
-+#include "base/memory/page_size.h"
- #include "base/posix/eintr_wrapper.h"
- #include "build/build_config.h"
- #include "sandbox/linux/system_headers/linux_signal.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
-+#include "sandbox/linux/tests/scoped_temporary_file.h"
- #include "sandbox/linux/tests/test_utils.h"
- #include "sandbox/linux/tests/unit_tests.h"
- #include "testing/gtest/include/gtest/gtest.h"
-@@ -93,6 +97,129 @@ TEST(SyscallWrappers, LinuxSigSet) {
- linux_sigset);
- }
-
-+TEST(SyscallWrappers, Stat) {
-+ // Create a file to stat, with 12 bytes of data.
-+ ScopedTemporaryFile tmp_file;
-+ EXPECT_EQ(12, write(tmp_file.fd(), "blahblahblah", 12));
-+
-+ // To test we have the correct stat structures for each kernel/platform, we
-+ // will right-align them on a page, with a guard page after.
-+ char* two_pages = static_cast<char*>(TestUtils::MapPagesOrDie(2));
-+ TestUtils::MprotectLastPageOrDie(two_pages, 2);
-+ char* page1_end = two_pages + base::GetPageSize();
-+
-+ // First, check that calling stat with |stat_buf| pointing to the last byte on
-+ // a page causes EFAULT.
-+ int res = sys_stat(tmp_file.full_file_name(),
-+ reinterpret_cast<struct kernel_stat*>(page1_end - 1));
-+ ASSERT_EQ(res, -1);
-+ ASSERT_EQ(errno, EFAULT);
-+
-+ // Now, check that we have the correctly sized stat structure.
-+ struct kernel_stat* sb = reinterpret_cast<struct kernel_stat*>(
-+ page1_end - sizeof(struct kernel_stat));
-+ // Memset to c's so we can check the kernel zero'd the padding...
-+ memset(sb, 'c', sizeof(struct kernel_stat));
-+ res = sys_stat(tmp_file.full_file_name(), sb);
-+ ASSERT_EQ(res, 0);
-+
-+ // Following fields may never be consistent but should be non-zero.
-+ // Don't trust the platform to define fields with any particular sign.
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_dev));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_ino));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_mode));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_blksize));
-+ EXPECT_NE(0u, static_cast<unsigned int>(sb->st_blocks));
-+
-+// We are the ones that made the file.
-+// Note: normally gid and uid overflow on backwards-compatible 32-bit systems
-+// and we end up with dummy uids and gids in place here.
-+#if defined(ARCH_CPU_64_BITS)
-+ EXPECT_EQ(geteuid(), sb->st_uid);
-+ EXPECT_EQ(getegid(), sb->st_gid);
-+#endif
-+
-+ // Wrote 12 bytes above which should fit in one block.
-+ EXPECT_EQ(12u, sb->st_size);
-+
-+ // Can't go backwards in time, 1500000000 was some time ago.
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_atime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_mtime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb->st_ctime_));
-+
-+ // Checking the padding for good measure.
-+#if defined(__x86_64__)
-+ EXPECT_EQ(0u, sb->__pad0);
-+ EXPECT_EQ(0u, sb->__unused4[0]);
-+ EXPECT_EQ(0u, sb->__unused4[1]);
-+ EXPECT_EQ(0u, sb->__unused4[2]);
-+#elif defined(__aarch64__)
-+ EXPECT_EQ(0u, sb->__pad1);
-+ EXPECT_EQ(0, sb->__pad2);
-+ EXPECT_EQ(0u, sb->__unused4);
-+ EXPECT_EQ(0u, sb->__unused5);
-+#endif
-+}
-+
-+TEST(SyscallWrappers, LStat) {
-+ // Create a file to stat, with 12 bytes of data.
-+ ScopedTemporaryFile tmp_file;
-+ EXPECT_EQ(12, write(tmp_file.fd(), "blahblahblah", 12));
-+
-+ // Also create a symlink.
-+ std::string symlink_name;
-+ {
-+ ScopedTemporaryFile tmp_file2;
-+ symlink_name = tmp_file2.full_file_name();
-+ }
-+ int rc = symlink(tmp_file.full_file_name(), symlink_name.c_str());
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't symlink " << symlink_name << " to target "
-+ << tmp_file.full_file_name();
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat lstat_info;
-+ rc = sys_lstat(symlink_name.c_str(), &lstat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_lstat " << symlink_name;
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat stat_info;
-+ rc = sys_stat(symlink_name.c_str(), &stat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_stat " << symlink_name;
-+ GTEST_FAIL();
-+ }
-+
-+ struct kernel_stat tmp_file_stat_info;
-+ rc = sys_stat(tmp_file.full_file_name(), &tmp_file_stat_info);
-+ if (rc < 0 && errno == EOVERFLOW) {
-+ GTEST_SKIP();
-+ }
-+ if (rc != 0) {
-+ PLOG(ERROR) << "Couldn't sys_stat " << tmp_file.full_file_name();
-+ GTEST_FAIL();
-+ }
-+
-+ // lstat should produce information about a symlink.
-+ ASSERT_TRUE(S_ISLNK(lstat_info.st_mode));
-+
-+ // stat-ing symlink_name and tmp_file should produce the same inode.
-+ ASSERT_EQ(stat_info.st_ino, tmp_file_stat_info.st_ino);
-+
-+ // lstat-ing symlink_name should give a different inode than stat-ing
-+ // symlink_name.
-+ ASSERT_NE(stat_info.st_ino, lstat_info.st_ino);
-+}
-+
- } // namespace
-
- } // namespace sandbox
-diff --git a/sandbox/linux/syscall_broker/DEPS b/sandbox/linux/syscall_broker/DEPS
-index c477f7d36394b..149c463b06839 100644
---- a/sandbox/linux/syscall_broker/DEPS
-+++ b/sandbox/linux/syscall_broker/DEPS
-@@ -1,4 +1,5 @@
- include_rules = [
-- "+sandbox/linux/system_headers",
- "+sandbox/linux/bpf_dsl",
-+ "+sandbox/linux/services",
-+ "+sandbox/linux/system_headers",
- ]
-diff --git a/sandbox/linux/syscall_broker/broker_client.cc b/sandbox/linux/syscall_broker/broker_client.cc
-index 6b1b5be433899..e24f659fcf872 100644
---- a/sandbox/linux/syscall_broker/broker_client.cc
-+++ b/sandbox/linux/syscall_broker/broker_client.cc
-@@ -166,7 +166,7 @@ int BrokerClient::Rmdir(const char* path) const {
-
- int BrokerClient::Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const {
-+ struct kernel_stat* sb) const {
- if (!pathname || !sb)
- return -EFAULT;
-
-@@ -181,7 +181,7 @@ int BrokerClient::Stat(const char* pathname,
-
- int BrokerClient::Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const {
-+ struct kernel_stat64* sb) const {
- if (!pathname || !sb)
- return -EFAULT;
-
-diff --git a/sandbox/linux/syscall_broker/broker_client.h b/sandbox/linux/syscall_broker/broker_client.h
-index 05e14c83f2010..26ca78101c71c 100644
---- a/sandbox/linux/syscall_broker/broker_client.h
-+++ b/sandbox/linux/syscall_broker/broker_client.h
-@@ -61,10 +61,10 @@ class SANDBOX_EXPORT BrokerClient : public SyscallDispatcher {
- int Rmdir(const char* path) const override;
- int Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const override;
-+ struct kernel_stat* sb) const override;
- int Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const override;
-+ struct kernel_stat64* sb) const override;
- int Unlink(const char* unlink) const override;
-
- private:
-diff --git a/sandbox/linux/syscall_broker/broker_host.cc b/sandbox/linux/syscall_broker/broker_host.cc
-index 1cd03a18df809..1cdc01a888f41 100644
---- a/sandbox/linux/syscall_broker/broker_host.cc
-+++ b/sandbox/linux/syscall_broker/broker_host.cc
-@@ -20,9 +20,11 @@
- #include "base/files/scoped_file.h"
- #include "base/logging.h"
- #include "base/posix/eintr_wrapper.h"
-+#include "sandbox/linux/services/syscall_wrappers.h"
- #include "sandbox/linux/syscall_broker/broker_command.h"
- #include "sandbox/linux/syscall_broker/broker_permission_list.h"
- #include "sandbox/linux/syscall_broker/broker_simple_message.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
- #include "sandbox/linux/system_headers/linux_syscalls.h"
-
- namespace sandbox {
-@@ -193,10 +195,12 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(reply->AddIntToMessage(-permission_list.denied_errno()));
- return;
- }
-+
- if (command_type == COMMAND_STAT) {
-- struct stat sb;
-- int sts =
-- follow_links ? stat(file_to_access, &sb) : lstat(file_to_access, &sb);
-+ struct kernel_stat sb;
-+
-+ int sts = follow_links ? sandbox::sys_stat(file_to_access, &sb)
-+ : sandbox::sys_lstat(file_to_access, &sb);
- if (sts < 0) {
- RAW_CHECK(reply->AddIntToMessage(-errno));
- return;
-@@ -205,10 +209,12 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(
- reply->AddDataToMessage(reinterpret_cast<char*>(&sb), sizeof(sb)));
- } else {
-+#if defined(__NR_fstatat64)
- DCHECK(command_type == COMMAND_STAT64);
-- struct stat64 sb;
-- int sts = follow_links ? stat64(file_to_access, &sb)
-- : lstat64(file_to_access, &sb);
-+ struct kernel_stat64 sb;
-+
-+ int sts = sandbox::sys_fstatat64(AT_FDCWD, file_to_access, &sb,
-+ follow_links ? 0 : AT_SYMLINK_NOFOLLOW);
- if (sts < 0) {
- RAW_CHECK(reply->AddIntToMessage(-errno));
- return;
-@@ -216,6 +222,11 @@ void StatFileForIPC(const BrokerCommandSet& allowed_command_set,
- RAW_CHECK(reply->AddIntToMessage(0));
- RAW_CHECK(
- reply->AddDataToMessage(reinterpret_cast<char*>(&sb), sizeof(sb)));
-+#else // defined(__NR_fstatat64)
-+ // We should not reach here on 64-bit systems, as the *stat*64() are only
-+ // necessary on 32-bit.
-+ RAW_CHECK(false);
-+#endif
- }
- }
-
-diff --git a/sandbox/linux/syscall_broker/broker_process_unittest.cc b/sandbox/linux/syscall_broker/broker_process_unittest.cc
-index 55ba6bccb29ec..c65f25a78a999 100644
---- a/sandbox/linux/syscall_broker/broker_process_unittest.cc
-+++ b/sandbox/linux/syscall_broker/broker_process_unittest.cc
-@@ -811,7 +811,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- const char* bad_leading_path5 = "/mbogo/fictitioux";
- const char* bad_leading_path6 = "/mbogo/fictitiousa";
-
-- struct stat sb;
-+ default_stat_struct sb;
-
- {
- // Actual file with permissions to see file but command not allowed.
-@@ -824,7 +824,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- tempfile_name, follow_links, &sb));
- }
-
-@@ -840,7 +840,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- nonesuch_name, follow_links, &sb));
- }
- {
-@@ -852,7 +852,7 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
-
- memset(&sb, 0, sizeof(sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- tempfile_name, follow_links, &sb));
- }
- {
-@@ -864,38 +864,39 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- nonesuch_name, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ nonesuch_name, follow_links, &sb));
-
- // Gets denied all the way back to root since no create permission.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- leading_path3, follow_links, &sb));
-
- // Not fooled by substrings.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path3, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path4, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path5, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path6, follow_links, &sb));
- }
- {
-@@ -907,37 +908,41 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- nonesuch_name, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ nonesuch_name, follow_links, &sb));
-
- // Gets ENOENT all the way back to root since it has create permission.
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path1, follow_links, &sb));
-- EXPECT_EQ(-ENOENT, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path2, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path1, follow_links, &sb));
-+ EXPECT_EQ(-ENOENT,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path2, follow_links, &sb));
-
- // But can always get the root.
-- EXPECT_EQ(0, open_broker.GetBrokerClientSignalBased()->Stat(
-- leading_path3, follow_links, &sb));
-+ EXPECT_EQ(0,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ leading_path3, follow_links, &sb));
-
- // Not fooled by substrings.
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path1, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path2, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path3, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path4, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path5, follow_links, &sb));
- EXPECT_EQ(-kFakeErrnoSentinel,
-- open_broker.GetBrokerClientSignalBased()->Stat(
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
- bad_leading_path6, follow_links, &sb));
- }
- {
-@@ -949,8 +954,9 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- ASSERT_TRUE(open_broker.Init(base::BindOnce(&NoOpCallback)));
-
- memset(&sb, 0, sizeof(sb));
-- EXPECT_EQ(0, open_broker.GetBrokerClientSignalBased()->Stat(
-- tempfile_name, follow_links, &sb));
-+ EXPECT_EQ(0,
-+ open_broker.GetBrokerClientSignalBased()->DefaultStatForTesting(
-+ tempfile_name, follow_links, &sb));
-
- // Following fields may never be consistent but should be non-zero.
- // Don't trust the platform to define fields with any particular sign.
-@@ -968,9 +974,9 @@ void TestStatHelper(bool fast_check_in_client, bool follow_links) {
- EXPECT_EQ(12, sb.st_size);
-
- // Can't go backwards in time, 1500000000 was some time ago.
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_atime));
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_mtime));
-- EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_ctime));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_atime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_mtime_));
-+ EXPECT_LT(1500000000u, static_cast<unsigned int>(sb.st_ctime_));
- }
- }
-
-diff --git a/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc b/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-index fffa9bb7082ce..f517a9867c5de 100644
---- a/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-+++ b/sandbox/linux/syscall_broker/remote_syscall_arg_handler_unittest.cc
-@@ -16,6 +16,7 @@
- #include "base/memory/page_size.h"
- #include "base/posix/unix_domain_socket.h"
- #include "base/test/bind.h"
-+#include "sandbox/linux/tests/test_utils.h"
- #include "sandbox/linux/tests/unit_tests.h"
- #include "testing/gtest/include/gtest/gtest.h"
-
-@@ -52,19 +53,6 @@ void VerifyCorrectString(std::string str, size_t size) {
- }
- }
-
--void* MapPagesOrDie(size_t num_pages) {
-- void* addr = mmap(nullptr, num_pages * base::GetPageSize(),
-- PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-- PCHECK(addr);
-- return addr;
--}
--
--void MprotectLastPageOrDie(char* addr, size_t num_pages) {
-- size_t last_page_offset = (num_pages - 1) * base::GetPageSize();
-- PCHECK(mprotect(addr + last_page_offset, base::GetPageSize(), PROT_NONE) >=
-- 0);
--}
--
- pid_t ForkWaitingChild(base::OnceCallback<void(int)>
- after_parent_signals_callback = base::DoNothing(),
- base::ScopedFD* parent_sync_fd = nullptr) {
-@@ -105,13 +93,13 @@ void ReadTest(const ReadTestConfig& test_config) {
- size_t total_pages = (test_config.start_at + test_config.total_size +
- base::GetPageSize() - 1) /
- base::GetPageSize();
-- char* mmap_addr = static_cast<char*>(MapPagesOrDie(total_pages));
-+ char* mmap_addr = static_cast<char*>(TestUtils::MapPagesOrDie(total_pages));
- char* addr = mmap_addr + test_config.start_at;
- FillBufferWithPath(addr, test_config.total_size,
- test_config.include_null_byte);
-
- if (test_config.last_page_inaccessible)
-- MprotectLastPageOrDie(mmap_addr, total_pages);
-+ TestUtils::MprotectLastPageOrDie(mmap_addr, total_pages);
-
- pid_t pid = ForkWaitingChild();
- munmap(mmap_addr, base::GetPageSize() * total_pages);
-@@ -212,7 +200,7 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChunkPlus1EndingOnePastPage) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChildExited) {
-- void* addr = MapPagesOrDie(1);
-+ void* addr = TestUtils::MapPagesOrDie(1);
- FillBufferWithPath(static_cast<char*>(addr), strlen(kPathPart) + 1, true);
-
- base::ScopedFD parent_sync, child_sync;
-@@ -240,10 +228,10 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, ReadChildExited) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, BasicWrite) {
-- void* read_from = MapPagesOrDie(1);
-+ void* read_from = TestUtils::MapPagesOrDie(1);
- const size_t write_size = base::GetPageSize();
- FillBufferWithPath(static_cast<char*>(read_from), write_size, false);
-- char* write_to = static_cast<char*>(MapPagesOrDie(1));
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(1));
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-
-@@ -278,8 +266,8 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, BasicWrite) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteToInvalidAddress) {
-- char* write_to = static_cast<char*>(MapPagesOrDie(1));
-- MprotectLastPageOrDie(write_to, 1);
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(1));
-+ TestUtils::MprotectLastPageOrDie(write_to, 1);
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-
-@@ -295,11 +283,11 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteToInvalidAddress) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WritePartiallyToInvalidAddress) {
-- char* read_from = static_cast<char*>(MapPagesOrDie(2));
-+ char* read_from = static_cast<char*>(TestUtils::MapPagesOrDie(2));
- const size_t write_size = base::GetPageSize();
- FillBufferWithPath(static_cast<char*>(read_from), write_size, false);
-- char* write_to = static_cast<char*>(MapPagesOrDie(2));
-- MprotectLastPageOrDie(write_to, 2);
-+ char* write_to = static_cast<char*>(TestUtils::MapPagesOrDie(2));
-+ TestUtils::MprotectLastPageOrDie(write_to, 2);
- write_to += base::GetPageSize() / 2;
- base::ScopedFD parent_signal_fd;
- const std::vector<int> empty_fd_vec;
-@@ -314,7 +302,7 @@ SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WritePartiallyToInvalidAddress) {
- }
-
- SANDBOX_TEST(BrokerRemoteSyscallArgHandler, WriteChildExited) {
-- char* addr = static_cast<char*>(MapPagesOrDie(1));
-+ char* addr = static_cast<char*>(TestUtils::MapPagesOrDie(1));
- FillBufferWithPath(static_cast<char*>(addr), strlen(kPathPart) + 1, true);
-
- base::ScopedFD parent_sync, child_sync;
-diff --git a/sandbox/linux/syscall_broker/syscall_dispatcher.cc b/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-index b9ee93c14ac59..8a42397ef872e 100644
---- a/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-+++ b/sandbox/linux/syscall_broker/syscall_dispatcher.cc
-@@ -19,8 +19,18 @@ namespace syscall_broker {
- #define BROKER_UNPOISON_STRING(x)
- #endif
-
-+int SyscallDispatcher::DefaultStatForTesting(const char* pathname,
-+ bool follow_links,
-+ default_stat_struct* sb) {
-+#if defined(__NR_fstatat64)
-+ return Stat64(pathname, follow_links, sb);
-+#elif defined(__NR_newfstatat)
-+ return Stat(pathname, follow_links, sb);
-+#endif
-+}
-+
- int SyscallDispatcher::PerformStatat(const arch_seccomp_data& args,
-- bool arch64) {
-+ bool stat64) {
- if (static_cast<int>(args.args[0]) != AT_FDCWD)
- return -EPERM;
- // Only allow the AT_SYMLINK_NOFOLLOW flag which is used by some libc
-@@ -30,13 +40,29 @@ int SyscallDispatcher::PerformStatat(const arch_seccomp_data& args,
-
- const bool follow_links =
- !(static_cast<int>(args.args[3]) & AT_SYMLINK_NOFOLLOW);
-- if (arch64) {
-+ if (stat64) {
- return Stat64(reinterpret_cast<const char*>(args.args[1]), follow_links,
-- reinterpret_cast<struct stat64*>(args.args[2]));
-+ reinterpret_cast<struct kernel_stat64*>(args.args[2]));
- }
-
- return Stat(reinterpret_cast<const char*>(args.args[1]), follow_links,
-- reinterpret_cast<struct stat*>(args.args[2]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[2]));
-+}
-+
-+int SyscallDispatcher::PerformUnlinkat(const arch_seccomp_data& args) {
-+ if (static_cast<int>(args.args[0]) != AT_FDCWD)
-+ return -EPERM;
-+
-+ int flags = static_cast<int>(args.args[2]);
-+
-+ if (flags == AT_REMOVEDIR) {
-+ return Rmdir(reinterpret_cast<const char*>(args.args[1]));
-+ }
-+
-+ if (flags != 0)
-+ return -EPERM;
-+
-+ return Unlink(reinterpret_cast<const char*>(args.args[1]));
- }
-
- int SyscallDispatcher::DispatchSyscall(const arch_seccomp_data& args) {
-@@ -127,59 +153,42 @@ int SyscallDispatcher::DispatchSyscall(const arch_seccomp_data& args) {
- #if defined(__NR_stat)
- case __NR_stat:
- return Stat(reinterpret_cast<const char*>(args.args[0]), true,
-- reinterpret_cast<struct stat*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[1]));
- #endif
- #if defined(__NR_stat64)
- case __NR_stat64:
- return Stat64(reinterpret_cast<const char*>(args.args[0]), true,
-- reinterpret_cast<struct stat64*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat64*>(args.args[1]));
- #endif
- #if defined(__NR_lstat)
- case __NR_lstat:
- // See https://crbug.com/847096
- BROKER_UNPOISON_STRING(reinterpret_cast<const char*>(args.args[0]));
- return Stat(reinterpret_cast<const char*>(args.args[0]), false,
-- reinterpret_cast<struct stat*>(args.args[1]));
-+ reinterpret_cast<struct kernel_stat*>(args.args[1]));
- #endif
- #if defined(__NR_lstat64)
- case __NR_lstat64:
- // See https://crbug.com/847096
- BROKER_UNPOISON_STRING(reinterpret_cast<const char*>(args.args[0]));
- return Stat64(reinterpret_cast<const char*>(args.args[0]), false,
-- reinterpret_cast<struct stat64*>(args.args[1]));
--#endif
--#if defined(__NR_fstatat)
-- case __NR_fstatat:
-- return PerformStatat(args, /*arch64=*/false);
-+ reinterpret_cast<struct kernel_stat64*>(args.args[1]));
- #endif
- #if defined(__NR_fstatat64)
- case __NR_fstatat64:
-- return PerformStatat(args, /*arch64=*/true);
-+ return PerformStatat(args, /*stat64=*/true);
- #endif
- #if defined(__NR_newfstatat)
- case __NR_newfstatat:
-- return PerformStatat(args, /*arch64=*/false);
-+ return PerformStatat(args, /*stat64=*/false);
- #endif
- #if defined(__NR_unlink)
- case __NR_unlink:
- return Unlink(reinterpret_cast<const char*>(args.args[0]));
- #endif
- #if defined(__NR_unlinkat)
-- case __NR_unlinkat: {
-- if (static_cast<int>(args.args[0]) != AT_FDCWD)
-- return -EPERM;
--
-- int flags = static_cast<int>(args.args[2]);
--
-- if (flags == AT_REMOVEDIR) {
-- return Rmdir(reinterpret_cast<const char*>(args.args[1]));
-- }
--
-- if (flags != 0)
-- return -EPERM;
--
-- return Unlink(reinterpret_cast<const char*>(args.args[1]));
-- }
-+ case __NR_unlinkat:
-+ return PerformUnlinkat(args);
- #endif // defined(__NR_unlinkat)
- default:
- RAW_CHECK(false);
-diff --git a/sandbox/linux/syscall_broker/syscall_dispatcher.h b/sandbox/linux/syscall_broker/syscall_dispatcher.h
-index d8b8874ad9ce4..1d6653caf3bd2 100644
---- a/sandbox/linux/syscall_broker/syscall_dispatcher.h
-+++ b/sandbox/linux/syscall_broker/syscall_dispatcher.h
-@@ -9,13 +9,15 @@
- #include <cstddef>
-
- #include "sandbox/linux/system_headers/linux_seccomp.h"
-+#include "sandbox/linux/system_headers/linux_stat.h"
-+#include "sandbox/sandbox_export.h"
-
- namespace sandbox {
- namespace syscall_broker {
-
- // An abstract class that defines all the system calls we perform for the
- // sandboxed process.
--class SyscallDispatcher {
-+class SANDBOX_EXPORT SyscallDispatcher {
- public:
- // Emulates access()/faccessat().
- // X_OK will always return an error in practice since the broker process
-@@ -40,19 +42,34 @@ class SyscallDispatcher {
- virtual int Rmdir(const char* path) const = 0;
-
- // Emulates stat()/stat64()/lstat()/lstat64()/fstatat()/newfstatat().
-+ // Stat64 is only available on 32-bit systems.
- virtual int Stat(const char* pathname,
- bool follow_links,
-- struct stat* sb) const = 0;
-+ struct kernel_stat* sb) const = 0;
- virtual int Stat64(const char* pathname,
- bool follow_links,
-- struct stat64* sb) const = 0;
-+ struct kernel_stat64* sb) const = 0;
-
- // Emulates unlink()/unlinkat().
- virtual int Unlink(const char* unlink) const = 0;
-
-+ // Different architectures use a different syscall from the stat family by
-+ // default in glibc. E.g. 32-bit systems use *stat*64() and fill out struct
-+ // kernel_stat64, whereas 64-bit systems use *stat*() and fill out struct
-+ // kernel_stat. Some tests want to call the SyscallDispatcher directly, and
-+ // should be using the default stat in order to test against glibc.
-+ int DefaultStatForTesting(const char* pathname,
-+ bool follow_links,
-+ default_stat_struct* sb);
-+
- // Validates the args passed to a *statat*() syscall and performs the syscall
-- // using Stat() or Stat64().
-- int PerformStatat(const arch_seccomp_data& args, bool arch64);
-+ // using Stat(), or on 32-bit systems it uses Stat64() for the *statat64()
-+ // syscalls.
-+ int PerformStatat(const arch_seccomp_data& args, bool stat64);
-+
-+ // Validates the args passed to an unlinkat() syscall and performs the syscall
-+ // using either Unlink() or Rmdir().
-+ int PerformUnlinkat(const arch_seccomp_data& args);
-
- // Reads the syscall number and arguments, imposes some policy (e.g. the *at()
- // system calls must only allow AT_FDCWD as the first argument), and
-diff --git a/sandbox/linux/system_headers/linux_stat.h b/sandbox/linux/system_headers/linux_stat.h
-new file mode 100644
-index 0000000000000..35788eb22a4e5
---- /dev/null
-+++ b/sandbox/linux/system_headers/linux_stat.h
-@@ -0,0 +1,188 @@
-+// Copyright 2021 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-+
-+#include <stdint.h>
-+
-+#include "build/build_config.h"
-+#include "sandbox/linux/system_headers/linux_syscalls.h"
-+
-+#if defined(ARCH_CPU_MIPS_FAMILY)
-+#if defined(ARCH_CPU_64_BITS)
-+struct kernel_stat {
-+#else
-+struct kernel_stat64 {
-+#endif
-+ unsigned st_dev;
-+ unsigned __pad0[3];
-+ unsigned long long st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned st_rdev;
-+ unsigned __pad1[3];
-+ long long st_size;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned st_blksize;
-+ unsigned __pad2;
-+ unsigned long long st_blocks;
-+};
-+#else
-+struct kernel_stat64 {
-+ unsigned long long st_dev;
-+ unsigned char __pad0[4];
-+ unsigned __st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned long long st_rdev;
-+ unsigned char __pad3[4];
-+ long long st_size;
-+ unsigned st_blksize;
-+ unsigned long long st_blocks;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned long long st_ino;
-+};
-+#endif
-+
-+#if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
-+struct kernel_stat {
-+ /* The kernel headers suggest that st_dev and st_rdev should be 32bit
-+ * quantities encoding 12bit major and 20bit minor numbers in an interleaved
-+ * format. In reality, we do not see useful data in the top bits. So,
-+ * we'll leave the padding in here, until we find a better solution.
-+ */
-+ unsigned short st_dev;
-+ short pad1;
-+ unsigned st_ino;
-+ unsigned short st_mode;
-+ unsigned short st_nlink;
-+ unsigned short st_uid;
-+ unsigned short st_gid;
-+ unsigned short st_rdev;
-+ short pad2;
-+ unsigned st_size;
-+ unsigned st_blksize;
-+ unsigned st_blocks;
-+ unsigned st_atime_;
-+ unsigned st_atime_nsec_;
-+ unsigned st_mtime_;
-+ unsigned st_mtime_nsec_;
-+ unsigned st_ctime_;
-+ unsigned st_ctime_nsec_;
-+ unsigned __unused4;
-+ unsigned __unused5;
-+};
-+#elif defined(__x86_64__)
-+struct kernel_stat {
-+ uint64_t st_dev;
-+ uint64_t st_ino;
-+ uint64_t st_nlink;
-+ unsigned st_mode;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned __pad0;
-+ uint64_t st_rdev;
-+ int64_t st_size;
-+ int64_t st_blksize;
-+ int64_t st_blocks;
-+ uint64_t st_atime_;
-+ uint64_t st_atime_nsec_;
-+ uint64_t st_mtime_;
-+ uint64_t st_mtime_nsec_;
-+ uint64_t st_ctime_;
-+ uint64_t st_ctime_nsec_;
-+ int64_t __unused4[3];
-+};
-+#elif (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+struct kernel_stat {
-+ unsigned st_dev;
-+ int st_pad1[3];
-+ unsigned st_ino;
-+ unsigned st_mode;
-+ unsigned st_nlink;
-+ unsigned st_uid;
-+ unsigned st_gid;
-+ unsigned st_rdev;
-+ int st_pad2[2];
-+ long st_size;
-+ int st_pad3;
-+ long st_atime_;
-+ long st_atime_nsec_;
-+ long st_mtime_;
-+ long st_mtime_nsec_;
-+ long st_ctime_;
-+ long st_ctime_nsec_;
-+ int st_blksize;
-+ int st_blocks;
-+ int st_pad4[14];
-+};
-+#elif defined(__aarch64__)
-+struct kernel_stat {
-+ unsigned long st_dev;
-+ unsigned long st_ino;
-+ unsigned int st_mode;
-+ unsigned int st_nlink;
-+ unsigned int st_uid;
-+ unsigned int st_gid;
-+ unsigned long st_rdev;
-+ unsigned long __pad1;
-+ long st_size;
-+ int st_blksize;
-+ int __pad2;
-+ long st_blocks;
-+ long st_atime_;
-+ unsigned long st_atime_nsec_;
-+ long st_mtime_;
-+ unsigned long st_mtime_nsec_;
-+ long st_ctime_;
-+ unsigned long st_ctime_nsec_;
-+ unsigned int __unused4;
-+ unsigned int __unused5;
-+};
-+#endif
-+
-+// On 32-bit systems, we default to the 64-bit stat struct like libc
-+// implementations do. Otherwise we default to the normal stat struct which is
-+// already 64-bit.
-+// These defines make it easy to call the right syscall to fill out a 64-bit
-+// stat struct, which is the default in libc implementations but requires
-+// different syscall names on 32 and 64-bit platforms.
-+#if defined(__NR_fstatat64)
-+
-+namespace sandbox {
-+using default_stat_struct = struct kernel_stat64;
-+} // namespace sandbox
-+
-+#define __NR_fstatat_default __NR_fstatat64
-+#define __NR_fstat_default __NR_fstat64
-+
-+#elif defined(__NR_newfstatat)
-+
-+namespace sandbox {
-+using default_stat_struct = struct kernel_stat;
-+} // namespace sandbox
-+
-+#define __NR_fstatat_default __NR_newfstatat
-+#define __NR_fstat_default __NR_fstat
-+
-+#else
-+#error "one of fstatat64 and newfstatat must be defined"
-+#endif
-+
-+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_STAT_H_
-diff --git a/sandbox/linux/system_headers/linux_time.h b/sandbox/linux/system_headers/linux_time.h
-index 780f24dddd9fa..f18c806611f83 100644
---- a/sandbox/linux/system_headers/linux_time.h
-+++ b/sandbox/linux/system_headers/linux_time.h
-@@ -11,6 +11,32 @@
- #define CPUCLOCK_CLOCK_MASK 3
- #endif
-
-+#if !defined(CPUCLOCK_PROF)
-+#define CPUCLOCK_PROF 0
-+#endif
-+
-+#if !defined(CPUCLOCK_VIRT)
-+#define CPUCLOCK_VIRT 1
-+#endif
-+
-+#if !defined(CPUCLOCK_SCHED)
-+#define CPUCLOCK_SCHED 2
-+#endif
-+
-+#if !defined(CPUCLOCK_PERTHREAD_MASK)
-+#define CPUCLOCK_PERTHREAD_MASK 4
-+#endif
-+
-+#if !defined(MAKE_PROCESS_CPUCLOCK)
-+#define MAKE_PROCESS_CPUCLOCK(pid, clock) \
-+ ((int)(~(unsigned)(pid) << 3) | (int)(clock))
-+#endif
-+
-+#if !defined(MAKE_THREAD_CPUCLOCK)
-+#define MAKE_THREAD_CPUCLOCK(tid, clock) \
-+ ((int)(~(unsigned)(tid) << 3) | (int)((clock) | CPUCLOCK_PERTHREAD_MASK))
-+#endif
-+
- #if !defined(CLOCKFD)
- #define CLOCKFD 3
- #endif
-diff --git a/sandbox/linux/tests/test_utils.cc b/sandbox/linux/tests/test_utils.cc
-index 847c20b20c5d2..cf6041a4b476a 100644
---- a/sandbox/linux/tests/test_utils.cc
-+++ b/sandbox/linux/tests/test_utils.cc
-@@ -5,12 +5,14 @@
- #include "sandbox/linux/tests/test_utils.h"
-
- #include <errno.h>
-+#include <sys/mman.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
-
- #include "base/check_op.h"
-+#include "base/memory/page_size.h"
- #include "base/posix/eintr_wrapper.h"
-
- namespace sandbox {
-@@ -39,4 +41,17 @@ void TestUtils::HandlePostForkReturn(pid_t pid) {
- }
- }
-
-+void* TestUtils::MapPagesOrDie(size_t num_pages) {
-+ void* addr = mmap(nullptr, num_pages * base::GetPageSize(),
-+ PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-+ PCHECK(addr);
-+ return addr;
-+}
-+
-+void TestUtils::MprotectLastPageOrDie(char* addr, size_t num_pages) {
-+ size_t last_page_offset = (num_pages - 1) * base::GetPageSize();
-+ PCHECK(mprotect(addr + last_page_offset, base::GetPageSize(), PROT_NONE) >=
-+ 0);
-+}
-+
- } // namespace sandbox
-diff --git a/sandbox/linux/tests/test_utils.h b/sandbox/linux/tests/test_utils.h
-index 7cf9749fe4f1f..43b028b1e34ef 100644
---- a/sandbox/linux/tests/test_utils.h
-+++ b/sandbox/linux/tests/test_utils.h
-@@ -19,6 +19,8 @@ class TestUtils {
- // makes sure that if fork() succeeded the child exits
- // and the parent waits for it.
- static void HandlePostForkReturn(pid_t pid);
-+ static void* MapPagesOrDie(size_t num_pages);
-+ static void MprotectLastPageOrDie(char* addr, size_t num_pages);
-
- private:
- DISALLOW_IMPLICIT_CONSTRUCTORS(TestUtils);
-diff --git a/sandbox/policy/linux/bpf_broker_policy_linux.cc b/sandbox/policy/linux/bpf_broker_policy_linux.cc
-index 2963bb9ca8612..6dc8c0581b43c 100644
---- a/sandbox/policy/linux/bpf_broker_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_broker_policy_linux.cc
-@@ -93,8 +93,8 @@ ResultExpr BrokerProcessPolicy::EvaluateSyscall(int sysno) const {
- return Allow();
- break;
- #endif
--#if defined(__NR_fstatat)
-- case __NR_fstatat:
-+#if defined(__NR_fstatat64)
-+ case __NR_fstatat64:
- if (allowed_command_set_.test(syscall_broker::COMMAND_STAT))
- return Allow();
- break;
diff --git a/srcpkgs/chromium/patches/musl-stat.patch b/srcpkgs/chromium/patches/musl-stat.patch
new file mode 100644
index 000000000000..427be1a3f4c2
--- /dev/null
+++ b/srcpkgs/chromium/patches/musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/base/files/file.h.orig
++++ b/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+- defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++ defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++ (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch b/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
deleted file mode 100644
index d1db7e420154..000000000000
--- a/srcpkgs/chromium/patches/remove-llvm13-warning-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/build/config/compiler/BUILD.gn.orig
-+++ b/build/config/compiler/BUILD.gn
-@@ -1620,10 +1620,6 @@
-
- # TODO(https://crbug.com/1050281): Clean up, enable.
- "-Wno-non-c-typedef-for-linkage",
--
-- # TODO(https://crbug.com/1203071): Clean up and enable.
-- "-Wno-unused-but-set-parameter",
-- "-Wno-unused-but-set-variable",
- ]
-
- cflags_c += [
diff --git a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..f0ce44c0a487
--- /dev/null
+++ b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
@@ -0,0 +1,66 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+---
+ build/config/compiler/BUILD.gn | 18 ++++++++++++------
+ build/config/compiler/compiler.gni | 7 ++-----
+ 2 files changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index ede07d111c..6db16c1cdd 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1216,12 +1216,19 @@ config("compiler_deterministic") {
+ # different build directory like "out/feature_a" and "out/feature_b" if
+ # we build same files with same compile flag.
+ # Other paths are already given in relative, no need to normalize them.
+- cflags += [
+- "-Xclang",
+- "-fdebug-compilation-dir",
+- "-Xclang",
+- ".",
+- ]
++ if (is_nacl) {
++ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
++ cflags += [
++ "-Xclang",
++ "-fdebug-compilation-dir",
++ "-Xclang",
++ ".",
++ ]
++ } else {
++ # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
++ # and -fcoverage-compilation-dir=.
++ cflags += [ "-ffile-compilation-dir=." ]
++ }
+ if (!is_win) {
+ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+ asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
+index 8c259c360a..642319b4f4 100644
+--- a/build/config/compiler/compiler.gni
++++ b/build/config/compiler/compiler.gni
+@@ -225,11 +225,8 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+- # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
+- # dependency to absolute path of source files.
+- !use_clang_coverage &&
+- (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+- is_chromeos || (is_apple && !enable_dsyms))
++ is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++ is_chromeos || (is_apple && !enable_dsyms)
+
+ # If the platform uses stripped absolute paths by default, then we don't expose
+ # it as a configuration option. If this is causing problems, please file a bug.
diff --git a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index a40ed9d5ac73..d109aeb5b95c 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -32,13 +32,13 @@ index 35f01d0a4..28f2e7475 100644
]
action_foreach("calculate_deb_dependencies") {
-@@ -315,7 +313,6 @@ group("installer_deps") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
":theme_files",
"//chrome",
"//chrome:packed_resources",
- "//chrome/browser/resources/media/mei_preload:component",
+ "//components/crash/core/app:chrome_crashpad_handler",
"//sandbox/linux:chrome_sandbox",
- "//third_party/crashpad/crashpad/handler:crashpad_handler",
]
diff --git a/sandbox/features.gni b/sandbox/features.gni
index db30ae6d6..9dc09bf53 100644
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 80823491366d..a26d99aa08a9 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=93.0.4577.82
+version=94.0.4606.61
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,13 +9,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=5d66214858fcba11a8f733d7a6fab61ed10e13e7df4ed37e63b66a0370fb2853
+checksum=6446db535c02c461c7e5c8d294a0300db03abba791f97f0c70bc52255aedb9bf
nocross=yes
lib32disabled=yes
build_options="clang debug js_optimize vaapi pulseaudio sndio pipewire"
-build_options_default="clang js_optimize vaapi pulseaudio sndio pipewire"
+build_options_default="clang js_optimize vaapi pulseaudio pipewire"
desc_option_clang="Use clang to build"
desc_option_debug="Build with debug symbols"
desc_option_js_optimize="Optimize the JS used for Chromium's UI"
@@ -24,7 +24,7 @@ desc_option_pulseaudio="Enable support for PulseAudio"
desc_option_sndio="Enable support for sndio"
desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
-hostmakedepends="$(vopt_if clang "clang lld") python pkgconf perl gperf bison ninja nodejs hwids
+hostmakedepends="$(vopt_if clang "clang lld llvm12") python pkgconf perl gperf bison ninja nodejs hwids
libatomic-devel libevent-devel libglib-devel $(vopt_if js_optimize openjdk)"
makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
@@ -43,8 +43,6 @@ case "$XBPS_TARGET_MACHINE" in
ppc64*-musl) makedepends+=" libucontext-devel" ;;
esac
-build_options_default="clang js_optimize vaapi pulseaudio pipewire"
-
post_patch() {
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
for f in "${FILESDIR}"/musl-patches/*.patch; do
@@ -77,6 +75,10 @@ post_patch() {
# prevent annoying errors when regenerating gni
vsed -i 's,^update_readme$,#update_readme,' \
third_party/libvpx/generate_gni.sh
+
+ # allow system dependencies in "official builds"
+ vsed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+ tools/generate_shim_headers/generate_shim_headers.py
}
do_configure() {
local system="" conf=()
@@ -167,6 +169,7 @@ do_configure() {
"is_clang=$(vopt_if clang true false)"
"use_lld=$(vopt_if clang true false)"
'clang_use_chrome_plugins=false'
+ 'clang_base_path="/usr"'
"gold_path=\"${XBPS_CROSS_BASE}/usr/bin/ld.gold\""
'use_custom_libcxx=false'
@@ -215,7 +218,15 @@ do_configure() {
# Save space by removing DLOG and DCHECK messages (about 6% reduction).
# 'logging_like_official_build=true'
- 'fieldtrial_testing_like_official_build=true'
+ 'disable_fieldtrial_testing_config=true'
+
+ 'is_official_build=true'
+
+ # segfaults with llvm-12.0.1
+ 'is_cfi=false'
+ 'use_thin_lto=false'
+ 'use_cfi_icall=false'
+ 'chrome_pgo_phase=0'
)
# this does not work on ppc64 yet
@@ -231,19 +242,32 @@ do_configure() {
ppc64*) conf+=( 'target_cpu="ppc64"' ) ;;
esac
+ if [ "$build_option_clang" ]; then
+ export CC=clang
+ export CXX=clang++
+ export AR=llvm-ar
+ export NM=llvm-nm
+ export CFLAGS="-Wno-unknown-warning-option"
+ export CXXFLAGS="-Wno-unknown-warning-option"
+ fi
+
out/Release/gn gen out/Release --args="${conf[*]}"
}
do_build() {
if [ "$build_option_clang" ]; then
export CC=clang
export CXX=clang++
+ export AR=llvm-ar
+ export NM=llvm-nm
+ export CFLAGS="-Wno-unknown-warning-option"
+ export CXXFLAGS="-Wno-unknown-warning-option"
fi
- ninja -C out/Release ${makejobs} chrome chromedriver mksnapshot crashpad_handler
+ ninja -C out/Release ${makejobs} chrome chromedriver mksnapshot chrome_crashpad_handler
}
do_install() {
vinstall out/Release/chrome 755 usr/lib/${pkgname} ${pkgname}
- vinstall out/Release/crashpad_handler 755 usr/lib/${pkgname} crashpad_handler
+ vinstall out/Release/chrome_crashpad_handler 755 usr/lib/${pkgname} chrome_crashpad_handler
vinstall out/Release/chromedriver 755 usr/lib/${pkgname} chromedriver
vinstall out/Release/libEGL.so 755 usr/lib/${pkgname} libEGL.so
vinstall out/Release/libGLESv2.so 755 usr/lib/${pkgname} libGLESv2.so
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: chromium: update to 94.0.4606.54.
2021-09-24 20:27 [PR PATCH] chromium: update to 94.0.4606.54 Duncaen
` (2 preceding siblings ...)
2021-09-25 16:09 ` Duncaen
@ 2021-09-25 16:10 ` Duncaen
3 siblings, 0 replies; 5+ messages in thread
From: Duncaen @ 2021-09-25 16:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
There's a merged pull request on the void-packages repository
chromium: update to 94.0.4606.54.
https://github.com/void-linux/void-packages/pull/33094
Description:
[ci skip]
- [x] x86_64-glibc
- [x] x86_64-musl
- [x] i686
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-09-25 16:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-24 20:27 [PR PATCH] chromium: update to 94.0.4606.54 Duncaen
2021-09-25 15:44 ` [PR PATCH] [Updated] " Duncaen
2021-09-25 15:49 ` Duncaen
2021-09-25 16:09 ` Duncaen
2021-09-25 16:10 ` [PR PATCH] [Merged]: " Duncaen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).