Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Raptor Engineering Public Development
Chromium
OpenPOWER Patches
Commits
955a63c4
Commit
955a63c4
authored
8 months ago
by
Timothy Pearson
Browse files
Options
Download
Email Patches
Plain Diff
Sync with internal Solid tree for upcoming 126.0.6478.126 release
parent
d0c35f41
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
4 deletions
+27
-4
README
README
+1
-1
patches/ppc64le/fixes/memory-allocator-dcheck-assert-fix.patch
...es/ppc64le/fixes/memory-allocator-dcheck-assert-fix.patch
+22
-0
patches/ppc64le/sandbox/0001-linux-seccomp-bpf-ppc64-glibc-workaround-in-SIGSYS-h.patch
...inux-seccomp-bpf-ppc64-glibc-workaround-in-SIGSYS-h.patch
+3
-3
patches/series
patches/series
+1
-0
No files found.
README
View file @
955a63c4
=================================================================================
VERSION
126.0.6478.
57
126.0.6478.
126
=================================================================================
APPLICATION
...
...
This diff is collapsed.
Click to expand it.
patches/ppc64le/fixes/memory-allocator-dcheck-assert-fix.patch
0 → 100644
View file @
955a63c4
--- a/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.cc
+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.cc
@@ -506,6 +506,9 @@
partition_page_count <= kMaxPartitionPagesPerRegularSlotSpan;
partition_page_count++) {
size_t candidate_size = partition_page_count * PartitionPageSize();
+ if (candidate_size > kMaxBucketed) {
+ break;
+ }
size_t waste = candidate_size % slot_size;
if (waste <= .02 * SystemPageSize()) {
return partition_page_count * NumSystemPagesPerPartitionPage();
@@ -522,6 +525,9 @@
size_t system_page_count =
partition_page_count * NumSystemPagesPerPartitionPage() - slack;
size_t candidate_size = system_page_count * SystemPageSize();
+ if (candidate_size > kMaxBucketed) {
+ break;
+ }
size_t waste = candidate_size % slot_size;
if (waste < best_waste) {
best_waste = waste;
This diff is collapsed.
Click to expand it.
patches/ppc64le/sandbox/0001-linux-seccomp-bpf-ppc64-glibc-workaround-in-SIGSYS-h.patch
View file @
955a63c4
...
...
@@ -23,9 +23,9 @@ Index: chromium-126.0.6478.57/sandbox/linux/seccomp-bpf/trap.cc
+ // parameter which causes checks against it to fail. For now, manually
+ // negate them back.
+ // TODO(shawn@anastas.io): investigate this issue further
+ auto nr = SECCOMP_SYSCALL(ctx);
+ if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
+ nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
+ auto
c
nr = SECCOMP_SYSCALL(ctx);
+ if (
c
nr == __NR_openat ||
c
nr == __NR_mkdirat ||
c
nr == __NR_faccessat ||
c
nr == __NR_readlinkat ||
+
c
nr == __NR_renameat ||
c
nr == __NR_renameat2 ||
c
nr == __NR_newfstatat ||
c
nr == __NR_unlinkat) {
+ if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
+ SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
+ }
...
...
This diff is collapsed.
Click to expand it.
patches/series
View file @
955a63c4
...
...
@@ -57,6 +57,7 @@ ppc64le/fixes/fix-rust-linking.patch
ppc64le/fixes/fix-breakpad-compile.patch
ppc64le/fixes/fix-partition-alloc-compile.patch
ppc64le/fixes/fix-study-crash.patch
ppc64le/fixes/memory-allocator-dcheck-assert-fix.patch
ppc64le/v8/0002-Add-ppc64-trap-instructions.patch
ppc64le/sandbox/fix-ppc64-linux-syscalls-headers.patch
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment