Commit 8b326c31 authored by Riku Voipio's avatar Riku Voipio

release 56.0.2924.76-2 to experimental

parent fd7d2cc5
chromium-browser (56.0.2924.76-2) experimental; urgency=medium
* Backport upstream bugfix for non-NEON builds, closes: #853108
* Fix seccomp sandboxing on arm64 platforms with DRI3
-- Riku Voipio <riku.voipio@linaro.org> Thu, 02 Feb 2017 09:37:05 +0200
chromium-browser (56.0.2924.76-1) experimental; urgency=medium
* New upstream stable release:
......
......@@ -3,7 +3,7 @@ Section: web
Priority: optional
Maintainer: Debian Chromium Maintainers <pkg-chromium-maint@lists.alioth.debian.org>
Uploaders:
Michael Gilbert <mgilbert@debian.org>,
Michael Gilbert <mgilbert@debian.org>, Riku Voipio <riku.voipio@linaro.org>
Vcs-Git: git://anonscm.debian.org/pkg-chromium/pkg-chromium.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-chromium/pkg-chromium.git
Homepage: http://www.chromium.org/Home
......
From: Riku Voipio <riku.voipio@linaro.org>
Subject: seccomp-bpf: whitelist memfd_create on all architectures
Origin: upstream, https://chromium.googlesource.com/chromium/src/+/2cd89ce477eb1e5ec041612369f29d75e651919e
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
index b30b3e6acef6..1d9f95cd6444 100644
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
@@ -120,9 +120,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
#if defined(__i386__) || defined(__arm__) || defined(__mips__)
case __NR_lstat64:
#endif
-#if defined(__i386__) || defined(__arm__) || defined(__x86_64__)
case __NR_memfd_create:
-#endif
case __NR_mkdirat:
case __NR_mknodat:
#if defined(__i386__)
diff --git a/sandbox/linux/system_headers/arm64_linux_syscalls.h b/sandbox/linux/system_headers/arm64_linux_syscalls.h
index 8acb2d100037..59d0eab8ecdc 100644
--- a/sandbox/linux/system_headers/arm64_linux_syscalls.h
+++ b/sandbox/linux/system_headers/arm64_linux_syscalls.h
@@ -1059,4 +1059,8 @@
#define __NR_getrandom 278
#endif
+#if !defined(__NR_memfd_create)
+#define __NR_memfd_create 279
+#endif
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h b/sandbox/linux/system_headers/mips64_linux_syscalls.h
index 5a179b073572..90f3d1bea8bf 100644
--- a/sandbox/linux/system_headers/mips64_linux_syscalls.h
+++ b/sandbox/linux/system_headers/mips64_linux_syscalls.h
@@ -1267,4 +1267,8 @@
#define __NR_getrandom (__NR_Linux + 313)
#endif
+#if !defined(__NR_memfd_create)
+#define __NR_memfd_create (__NR_Linux + 314)
+#endif
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h b/sandbox/linux/system_headers/mips_linux_syscalls.h
index 819f9eb38b57..784d6b8ae085 100644
--- a/sandbox/linux/system_headers/mips_linux_syscalls.h
+++ b/sandbox/linux/system_headers/mips_linux_syscalls.h
@@ -1429,4 +1429,8 @@
#define __NR_getrandom (__NR_Linux + 353)
#endif
+#if !defined(__NR_memfd_create)
+#define __NR_memfd_create (__NR_Linux + 354)
+#endif
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
--
2.11.0
Description: [Opus] Only include NEON sources and macros when arm_use_neon==true
Origin: upstream, https://chromium.googlesource.com/chromium/src/+/22d06b0c916aa422a57e58d634cb73c2909b320d
arm_neon.h throws an error when included in a non-neon build. Only
include neon-related sources when use_arm_neon is true.
---
third_party/opus/BUILD.gn | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/third_party/opus/BUILD.gn b/third_party/opus/BUILD.gn
index 3bb5e0df499e..6211449f8a8a 100644
--- a/third_party/opus/BUILD.gn
+++ b/third_party/opus/BUILD.gn
@@ -371,12 +371,9 @@ static_library("opus") {
"src/celt/arm/arm_celt_map.c",
"src/celt/arm/armcpu.c",
"src/celt/arm/armcpu.h",
- "src/celt/arm/celt_neon_intr.c",
"src/celt/arm/fft_arm.h",
"src/celt/arm/mdct_arm.h",
"src/celt/arm/pitch_arm.h",
- "src/silk/arm/NSQ_neon.c",
- "src/silk/arm/NSQ_neon.h",
"src/silk/arm/arm_silk_map.c",
]
@@ -385,14 +382,25 @@ static_library("opus") {
defines += [
"OPUS_ARM_MAY_HAVE_EDSP",
"OPUS_ARM_MAY_HAVE_MEDIA",
- "OPUS_ARM_MAY_HAVE_NEON",
- "OPUS_ARM_MAY_HAVE_NEON_INTR",
"OPUS_HAVE_RTCD",
]
deps = [
":convert_rtcd_assembler",
]
+
+ if (arm_use_neon) {
+ sources += [
+ "src/celt/arm/celt_neon_intr.c",
+ "src/silk/arm/NSQ_neon.c",
+ "src/silk/arm/NSQ_neon.h",
+ ]
+
+ defines += [
+ "OPUS_ARM_MAY_HAVE_NEON",
+ "OPUS_ARM_MAY_HAVE_NEON_INTR",
+ ]
+ }
}
}
}
--
2.11.0
......@@ -17,6 +17,8 @@ fixes/glibc2.24.patch
fixes/gpu-timeout.patch
fixes/widevine-revision.patch
fixes/chromedriver-revision.patch
fixes/opus-no-neon.patch
fixes/arm64-seccomp-memfd.patch
system/icu.patch
system/vpx.patch
......
......@@ -29,7 +29,7 @@ defines+=host_cpu=\"arm64\"
endif
ifeq (armhf,$(DEB_HOST_ARCH))
defines+=host_cpu=\"arm\" \
arm_use_neon=false
arm_use_neon=false
endif
# disabled features
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment