Commit 93af6deb authored by jam's avatar jam Committed by Commit bot

Fix ARM Chrome not starting up.

The seccomp bpf filter was complaining because getsockopt and setsockopt were being called but they're not allowed. I had fixed this for x86-64 in r360114 but the change should have also allowed ARM. Really, it's anything other than 32 bit Linux (which doesn't have a specific id for these methods).

BUG=572795,561803

Review URL: https://codereview.chromium.org/1553543002

Cr-Commit-Position: refs/heads/master@{#367102}
parent f03ecfc1
...@@ -231,7 +231,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno, ...@@ -231,7 +231,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
return RestrictSocketcallCommand(); return RestrictSocketcallCommand();
#endif #endif
#if defined(__x86_64__) #if !defined(__i386__)
if (sysno == __NR_getsockopt || sysno ==__NR_setsockopt) { if (sysno == __NR_getsockopt || sysno ==__NR_setsockopt) {
// Used by Mojo EDK to catch a message pipe being sent over itself. // Used by Mojo EDK to catch a message pipe being sent over itself.
const Arg<int> level(1); const Arg<int> level(1);
......
...@@ -335,7 +335,7 @@ BPF_DEATH_TEST_C(BaselinePolicy, ...@@ -335,7 +335,7 @@ BPF_DEATH_TEST_C(BaselinePolicy,
clock_gettime(CLOCK_MONOTONIC_RAW, &ts); clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
} }
#if defined(__x86_64__) #if !defined(__i386__)
BPF_DEATH_TEST_C(BaselinePolicy, BPF_DEATH_TEST_C(BaselinePolicy,
GetSockOptWrongLevelSigsys, GetSockOptWrongLevelSigsys,
DEATH_SEGV_MESSAGE(sandbox::GetErrorMessageContentForTests()), DEATH_SEGV_MESSAGE(sandbox::GetErrorMessageContentForTests()),
......
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