parent
bb2c9f3934
commit
34b9d4c78d
@ -0,0 +1,25 @@
|
||||
--- a/buildtools/linux64/clang-format.orig 2021-08-23 09:18:56.269570955 +0200
|
||||
+++ b/buildtools/linux64/clang-format 2021-08-23 09:17:55.531190516 +0200
|
||||
@@ -10,9 +10,9 @@
|
||||
args = sys.argv[1:]
|
||||
inputfiles = [a for a in args if not a.startswith('-')]
|
||||
|
||||
-contents = ''
|
||||
+contents = b''
|
||||
if '-' in args or not inputfiles:
|
||||
- contents = sys.stdin.read()
|
||||
+ contents = sys.stdin.buffer.read()
|
||||
|
||||
# Tarball builds may or may not have depot_tools in $PATH. In the former case,
|
||||
# running 'clang-format' will call back into this script infinitely. Strip off
|
||||
@@ -34,8 +34,8 @@
|
||||
stdout, stderr = proc.communicate(input=contents)
|
||||
# Ignore if clang-format fails. Eg: it may be too old to support C++14.
|
||||
if proc.returncode == 0:
|
||||
- sys.stdout.write(stdout)
|
||||
- sys.stderr.write(stderr)
|
||||
+ sys.stdout.buffer.write(stdout)
|
||||
+ sys.stderr.buffer.write(stderr)
|
||||
sys.exit(0)
|
||||
except OSError:
|
||||
# Ignore if clang-format is not installed.
|
@ -0,0 +1,16 @@
|
||||
diff -up chromium-92.0.4515.107/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.clone3 chromium-92.0.4515.107/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||
--- chromium-92.0.4515.107/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.clone3 2021-08-16 09:05:35.836277326 -0400
|
||||
+++ chromium-92.0.4515.107/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-08-16 09:06:17.420502628 -0400
|
||||
@@ -178,6 +178,12 @@ ResultExpr EvaluateSyscallImpl(int fs_de
|
||||
return RestrictCloneToThreadsAndEPERMFork();
|
||||
}
|
||||
|
||||
+ // clone3 takes a pointer argument which we cannot examine, so return ENOSYS
|
||||
+ // to force the libc to use clone. See https://crbug.com/1213452.
|
||||
+ if (sysno == __NR_clone3) {
|
||||
+ return Error(ENOSYS);
|
||||
+ }
|
||||
+
|
||||
if (sysno == __NR_fcntl)
|
||||
return RestrictFcntlCommands();
|
||||
|
Loading…
Reference in new issue