mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-26 08:51:25 +02:00
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
diff --git a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
|
|
index 003708d2c..79488795d 100644
|
|
--- a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
|
|
+++ b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
|
|
@@ -25,6 +25,11 @@
|
|
#include "sandbox/linux/system_headers/linux_seccomp.h"
|
|
#include "sandbox/linux/system_headers/linux_signal.h"
|
|
|
|
+// musl libc defines siginfo_t __si_fields instead of _sifields
|
|
+#if defined(OS_LINUX) && !defined(__GLIBC__)
|
|
+#define _sifields __si_fields
|
|
+#endif
|
|
+
|
|
namespace {
|
|
|
|
struct arch_sigsys {
|
|
diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
|
|
index 0f59f2a87..5c07dbb31 100644
|
|
--- a/security/sandbox/linux/SandboxFilter.cpp
|
|
+++ b/security/sandbox/linux/SandboxFilter.cpp
|
|
@@ -989,6 +989,7 @@ class ContentSandboxPolicy : public SandboxPolicyCommon {
|
|
// ffmpeg, and anything else that calls isatty(), will be told
|
|
// that nothing is a typewriter:
|
|
.ElseIf(request == TCGETS, Error(ENOTTY))
|
|
+ .ElseIf(request == TIOCGWINSZ, Error(ENOTTY))
|
|
// Allow anything that isn't a tty ioctl, for now; bug 1302711
|
|
// will cover changing this to a default-deny policy.
|
|
.ElseIf(shifted_type != kTtyIoctls, Allow())
|