qt5-webengine: drop an unused patch
This commit is contained in:
parent
88d334caf9
commit
e8d3782cc1
@ -20,7 +20,6 @@ Upstream: Currently being submitted
|
||||
.../seccomp-bpf-helpers/baseline_policy.cc | 10 +-
|
||||
.../baseline_policy_unittest.cc | 2 +-
|
||||
.../syscall_parameters_restrictions.cc | 24 +-
|
||||
.../syscall_parameters_restrictions.cc.orig | 13 +-
|
||||
.../syscall_parameters_restrictions.h | 2 +-
|
||||
.../linux/seccomp-bpf-helpers/syscall_sets.cc | 121 +--
|
||||
.../linux/seccomp-bpf-helpers/syscall_sets.h | 8 +-
|
||||
@ -367,37 +366,6 @@ index be8225987..d21c24bf0 100644
|
||||
PTRACE_GETREGS,
|
||||
PTRACE_GETFPREGS,
|
||||
PTRACE_GET_THREAD_AREA,
|
||||
diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.orig b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.orig
|
||||
index 348ab6e8c..be8225987 100644
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.orig
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.orig
|
||||
@@ -139,7 +139,7 @@ namespace sandbox {
|
||||
// present (as in newer versions of posix_spawn).
|
||||
ResultExpr RestrictCloneToThreadsAndEPERMFork() {
|
||||
const Arg<unsigned long> flags(0);
|
||||
-
|
||||
+#if defined(__GLIBC__)
|
||||
// TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
|
||||
const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
|
||||
CLONE_SIGHAND | CLONE_THREAD |
|
||||
@@ -166,6 +166,17 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
|
||||
return If(IsAndroid() ? android_test : glibc_test, Allow())
|
||||
.ElseIf(is_fork_or_clone_vfork, Error(EPERM))
|
||||
.Else(CrashSIGSYSClone());
|
||||
+#else
|
||||
+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
|
||||
+ CLONE_THREAD | CLONE_SYSVSEM;
|
||||
+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
|
||||
+ CLONE_DETACHED;
|
||||
+ const BoolExpr thread_clone_ok = (flags&~safe)==required;
|
||||
+
|
||||
+ return If(thread_clone_ok, Allow())
|
||||
+ .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
|
||||
+ .Else(CrashSIGSYSClone());
|
||||
+#endif
|
||||
}
|
||||
|
||||
ResultExpr RestrictPrctl() {
|
||||
diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
||||
index cb563dfc5..2b17800d4 100644
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
||||
|
Loading…
x
Reference in New Issue
Block a user