Seccomp: merge i386 and x86_64 architectures in system call sets.

content/common/sandbox_seccomp_bpf_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <asm/unistd.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/audit.h>
 #include <linux/filter.h>
@@ skipping 129 matching lines @@
   int flags = static_cast<int>(arg1);
 
   if (strcmp(pathname, kDriRcPath) == 0) {
     int ret = OpenWithCache(pathname, flags);
     return (ret == -1) ? -errno : ret;
   } else {
     return -ENOENT;
   }
 }
 
-#if defined(__x86_64__)
+#if defined(__i386__) || defined(__x86_64__)
 
-// The functions below cover all existing x86_64 system calls.
+// The functions below cover all existing x86_64 and i386 system calls.
 // The implicitly defined sets form a partition of the sets of
 // system calls.
 
 // TODO(jln) we need to restrict the first parameter!
 bool IsKill(int sysno) {
   switch (sysno) {
     case __NR_kill:
     case __NR_tkill:
     case __NR_tgkill:
       return true;
     default:
       return false;
   }
 }
 
 bool IsAllowedGettime(int sysno) {
   switch (sysno) {
     case __NR_clock_gettime:
     case __NR_gettimeofday:
     case __NR_time:
       return true;
     case __NR_adjtimex:         // Privileged.
     case __NR_clock_adjtime:    // Privileged.
     case __NR_clock_getres:     // Could be allowed.
     case __NR_clock_nanosleep:  // Could be allowed.
     case __NR_clock_settime:    // Privileged.
+#if defined(__i386__)
+    case __NR_ftime:            // Obsolete.
+#endif
     case __NR_settimeofday:     // Privileged.
+#if defined(__i386__)
+    case __NR_stime:
+#endif
     default:
       return false;
   }
 }
 
 bool IsCurrentDirectory(int sysno) {
   switch (sysno)  {
     case __NR_getcwd:
     case __NR_chdir:
     case __NR_fchdir:
@@ skipping 14 matching lines @@
 
 // System calls that directly access the file system. They might acquire
 // a new file descriptor or otherwise perform an operation directly
 // via a path.
 // Both EPERM and ENOENT are valid errno unless otherwise noted in comment.
 bool IsFileSystem(int sysno) {
   switch (sysno) {
     case __NR_access:          // EPERM not a valid errno.
     case __NR_chmod:
     case __NR_chown:
+#if defined(__i386__)
+    case __NR_chown32:
+#endif
     case __NR_creat:
     case __NR_execve:
     case __NR_faccessat:       // EPERM not a valid errno.
     case __NR_fchmodat:
     case __NR_fchownat:        // Should be called chownat ?
+#if defined(__x86_64__)
+    case __NR_newfstatat:      // fstatat(). EPERM not a valid errno.
+#elif defined(__i386__)
+    case __NR_fstatat64:
+#endif
     case __NR_futimesat:       // Should be called utimesat ?
     case __NR_lchown:
+#if defined(__i386__)
+    case __NR_lchown32:
+#endif
     case __NR_link:
     case __NR_linkat:
     case __NR_lookup_dcookie:  // ENOENT not a valid errno.
     case __NR_lstat:           // EPERM not a valid errno.
+#if defined(__i386__)
+    case __NR_oldlstat:
+    case __NR_lstat64:

[Jorge Lucangeli Obes, 2012/08/13 23:55:12]

Broke alphabetical ordering to keep lstat close to its friends?

[jln (very slow on Chromium), 2012/08/14 00:22:54]

Yes, I thought it would make sense and improve readability.

+#endif
     case __NR_mkdir:
     case __NR_mkdirat:
     case __NR_mknod:
     case __NR_mknodat:
-    case __NR_newfstatat:      // EPERM not a valid errno.
-                               // Should be called statat ?
     case __NR_open:
     case __NR_openat:
     case __NR_readlink:        // EPERM not a valid errno.
     case __NR_readlinkat:
     case __NR_rename:
     case __NR_renameat:
     case __NR_rmdir:
     case __NR_stat:            // EPERM not a valid errno.
+#if defined(__i386__)
+    case __NR_oldstat:
+    case __NR_stat64:
+#endif
     case __NR_statfs:          // EPERM not a valid errno.
+#if defined(__i386__)
+    case __NR_statfs64:
+#endif
     case __NR_symlink:
     case __NR_symlinkat:
     case __NR_truncate:
+#if defined(__i386__)
+    case __NR_truncate64:
+#endif
     case __NR_unlink:
     case __NR_unlinkat:
     case __NR_uselib:          // Neither EPERM, nor ENOENT are valid errno.
     case __NR_ustat:           // Same as above. Deprecated.
     case __NR_utime:
     case __NR_utimensat:       // New.
     case __NR_utimes:
       return true;
     default:
       return false;
   }
 }
 
 bool IsAllowedFileSystemAccessViaFd(int sysno) {
   switch (sysno) {
     case __NR_fstat:
+#if defined(__i386__)
+    case __NR_fstat64:
+#endif
       return true;
     // TODO(jln): these should be denied gracefully as well (moved below).
     case __NR_fadvise64:        // EPERM not a valid errno.
+#if defined(__i386__)
+    case __NR_fadvise64_64:
+#endif
     case __NR_fdatasync:        // EPERM not a valid errno.
     case __NR_flock:            // EPERM not a valid errno.
     case __NR_fstatfs:          // Give information about the whole filesystem.
+#if defined(__i386__)
+    case __NR_fstatfs64:
+#endif
     case __NR_fsync:            // EPERM not a valid errno.
+#if defined(__i386__)
+    case __NR_oldfstat:
+#endif
     case __NR_sync_file_range:  // EPERM not a valid errno.
     default:
       return false;
   }
 }
 
 // EPERM is a good errno for any of these.
 bool IsDeniedFileSystemAccessViaFd(int sysno) {
   switch (sysno) {
     case __NR_fallocate:
     case __NR_fchmod:
     case __NR_fchown:
+#if defined(__i386__)
+    case __NR_fchown32:
+#endif
     case __NR_ftruncate:
+#if defined(__i386__)
+    case __NR_ftruncate64:
+#endif
     case __NR_getdents:         // EPERM not a valid errno.
     case __NR_getdents64:       // EPERM not a valid errno.
+#if defined(__i386__)
+    case __NR_readdir:
+#endif
       return true;
     default:
       return false;
   }
 }
 
 bool IsGetSimpleId(int sysno) {
   switch (sysno) {
     case __NR_capget:
     case __NR_getegid:
+#if defined(__i386__)
+    case __NR_getegid32:
+#endif
     case __NR_geteuid:
+#if defined(__i386__)
+    case __NR_geteuid32:
+#endif
     case __NR_getgid:
+#if defined(__i386__)
+    case __NR_getgid32:
+#endif
     case __NR_getgroups:
+#if defined(__i386__)
+    case __NR_getgroups32:
+#endif
     case __NR_getpid:
     case __NR_getppid:
     case __NR_getresgid:
+#if defined(__i386__)
+    case __NR_getresgid32:
+#endif
     case __NR_getresuid:
+#if defined(__i386__)
+    case __NR_getresuid32:
+#endif
     case __NR_getsid:
     case __NR_gettid:
     case __NR_getuid:
+#if defined(__i386__)
+    case __NR_getuid32:
+#endif
       return true;
     default:
       return false;
   }
 }
 
 bool IsProcessPrivilegeChange(int sysno) {
   switch (sysno) {
     case __NR_capset:
     case __NR_ioperm:  // Intel privilege.
     case __NR_iopl:    // Intel privilege.
     case __NR_setfsgid:
     case __NR_setfsuid:
     case __NR_setgid:
     case __NR_setgroups:
     case __NR_setregid:
     case __NR_setresgid:
     case __NR_setresuid:
     case __NR_setreuid:
     case __NR_setuid:
+#if defined(__i386__)
+    case __NR_setfsgid32:
+    case __NR_setfsuid32:
+    case __NR_setgid32:
+    case __NR_setgroups32:
+    case __NR_setregid32:
+    case __NR_setresgid32:
+    case __NR_setresuid32:
+    case __NR_setreuid32:
+    case __NR_setuid32:
+#endif
       return true;
     default:
       return false;
   }
 }
 
 bool IsProcessGroupOrSession(int sysno) {
   switch (sysno) {
     case __NR_setpgid:
     case __NR_getpgrp:
     case __NR_setsid:
     case __NR_getpgid:
       return true;
     default:
       return false;
   }
 }
 
 bool IsAllowedSignalHandling(int sysno) {
   switch (sysno) {
     case __NR_rt_sigaction:
     case __NR_rt_sigprocmask:
     case __NR_rt_sigreturn:
+#if defined(__i386__)
+    case __NR_sigaction:
+    case __NR_sigprocmask:
+    case __NR_sigreturn:
+#endif
       return true;
     case __NR_rt_sigpending:
     case __NR_rt_sigqueueinfo:
     case __NR_rt_sigsuspend:
     case __NR_rt_sigtimedwait:
     case __NR_rt_tgsigqueueinfo:
     case __NR_sigaltstack:
     case __NR_signalfd:
     case __NR_signalfd4:
+#if defined(__i386__)
+    case __NR_signal:
+    case __NR_sigpending:
+    case __NR_sigsuspend:
+    case __NR_sgetmask:  // Obsolete.
+    case __NR_ssetmask:
+#endif
     default:
       return false;
   }
 }
 
 bool IsOperationOnFd(int sysno) {
   switch (sysno) {
     case __NR_close:
     case __NR_dup:
     case __NR_dup2:
     case __NR_dup3:
     case __NR_fcntl:  // TODO(jln): we may want to restrict arguments.
+#if defined(__i386__)
+    case __NR_fcntl64:
+#endif
+#if defined(__x86_64__)
     case __NR_shutdown:
+#endif
       return true;
     default:
       return false;
   }
 }
 
 bool IsKernelInteralApi(int sysno) {
   switch (sysno) {
     case __NR_restart_syscall:
       return true;
     default:
       return false;
   }
 }
 
 // This should be thought through in conjunction with IsFutex().
 bool IsAllowedProcessStartOrDeath(int sysno) {
   switch (sysno) {
     case __NR_clone:  // TODO(jln): restrict flags.
     case __NR_exit:
     case __NR_exit_group:
     case __NR_wait4:
     case __NR_waitid:
+#if defined(__i386__)
+    case __NR_waitpid:
+#endif
       return true;
     case __NR_setns:  // Privileged.
     case __NR_fork:
     case __NR_get_thread_area:
     case __NR_set_thread_area:
     case __NR_set_tid_address:
     case __NR_unshare:
     case __NR_vfork:
     default:
       return false;
@@ skipping 13 matching lines @@
 }
 
 bool IsAllowedEpoll(int sysno) {
   switch (sysno) {
     case __NR_epoll_create:
     case __NR_epoll_create1:
     case __NR_epoll_ctl:
     case __NR_epoll_wait:
       return true;
     default:
+#if defined(__x86_64__)
     case __NR_epoll_ctl_old:
+#endif
     case __NR_epoll_pwait:
+#if defined(__x86_64__)
     case __NR_epoll_wait_old:
+#endif
       return false;
   }
 }
 
 bool IsAllowedGetOrModifySocket(int sysno) {
   switch (sysno) {
     case __NR_pipe:
     case __NR_pipe2:
+#if defined(__x86_64__)
     case __NR_socketpair:  // We will want to inspect its argument.
+#endif
       return true;
     default:
+#if defined(__x86_64__)
     case __NR_accept:
     case __NR_accept4:
     case __NR_bind:
     case __NR_connect:
     case __NR_socket:
     case __NR_listen:
+#endif
       return false;
   }
 }
 
+#if defined(__i386__)
+// Big multiplexing system call for sockets.
+bool IsSocketCall(int sysno) {
+  switch (sysno) {
+    case __NR_socketcall:
+      return true;
+    default:
+      return false;
+  }
+}
+#endif
+
+#if defined(__x86_64__)
 bool IsNetworkSocketInformation(int sysno) {
   switch (sysno) {
     case __NR_getpeername:
     case __NR_getsockname:
     case __NR_getsockopt:
     case __NR_setsockopt:
       return true;
     default:
       return false;
   }
 }
+#endif
 
 bool IsAllowedAddressSpaceAccess(int sysno) {
   switch (sysno) {
     case __NR_brk:
     case __NR_madvise:
     case __NR_mlock:
-    case __NR_mmap:  // TODO(jln): to restrict flags.
+    case __NR_mmap:   // TODO(jln): to restrict flags.
+#if defined(__i386__)
+    case __NR_mmap2:
+#endif
     case __NR_mprotect:
     case __NR_munlock:
     case __NR_munmap:
       return true;
     case __NR_mincore:
     case __NR_mlockall:
     case __NR_modify_ldt:
     case __NR_mremap:
     case __NR_msync:
     case __NR_munlockall:
     case __NR_readahead:
     case __NR_remap_file_pages:
+#if defined(__i386__)
+    case __NR_vm86:
+    case __NR_vm86old:
+#endif
     default:
       return false;
   }
 }
 
 bool IsAllowedGeneralIo(int sysno) {
   switch (sysno) {
     case __NR_lseek:
+#if defined(__i386__)
+    case __NR__llseek:
+#endif
     case __NR_poll:
     case __NR_ppoll:
     case __NR_pselect6:
     case __NR_read:
     case __NR_readv:
+#if defined(__x86_64__)
     case __NR_recvfrom:  // Could specify source.
     case __NR_recvmsg:   // Could specify source.
+#endif
     case __NR_select:
+#if defined(__i386__)
+    case __NR__newselect:
+#endif
+#if defined(__x86_64__)
     case __NR_sendmsg:   // Could specify destination.
     case __NR_sendto:    // Could specify destination.
+#endif
     case __NR_write:
     case __NR_writev:
       return true;
     case __NR_ioctl:     // Can be very powerful.
     case __NR_pread64:
     case __NR_preadv:
     case __NR_pwrite64:
     case __NR_pwritev:
     case __NR_recvmmsg:  // Could specify source.
     case __NR_sendfile:
+#if defined(__i386__)
+    case __NR_sendfile64:
+#endif
     case __NR_sendmmsg:  // Could specify destination.
     case __NR_splice:
     case __NR_tee:
     case __NR_vmsplice:
     default:
       return false;
   }
 }
 
 bool IsAllowedPrctl(int sysno) {
   switch (sysno) {
     case __NR_prctl:
       return true;
     default:
+#if defined(__x86_64__)
     case __NR_arch_prctl:
+#endif
       return false;
   }
 }
 
 bool IsAllowedBasicScheduler(int sysno) {
   switch (sysno) {
     case __NR_sched_yield:
     case __NR_pause:
     case __NR_nanosleep:
       return true;
     case __NR_getpriority:
+#if defined(__i386__)
+    case __NR_nice:
+#endif
     case __NR_setpriority:
     default:
       return false;
   }
 }
 
 bool IsAdminOperation(int sysno) {
   switch (sysno) {
+#if defined(__i386__)
+    case __NR_bdflush:
+#endif
     case __NR_kexec_load:
     case __NR_reboot:
     case __NR_setdomainname:
     case __NR_sethostname:
     case __NR_syslog:
       return true;
     default:
       return false;
   }
 }
@@ skipping 22 matching lines @@
   }
 }
 
 bool IsFsControl(int sysno) {
   switch (sysno) {
     case __NR_mount:
     case __NR_nfsservctl:
     case __NR_quotactl:
     case __NR_swapoff:
     case __NR_swapon:
+#if defined(__i386__)
+    case __NR_umount:
+#endif
     case __NR_umount2:
       return true;
     default:
       return false;
   }
 }
 
 bool IsNuma(int sysno) {
   switch (sysno) {
     case __NR_get_mempolicy:
@@ skipping 19 matching lines @@
       return true;
     default:
       return false;
   }
 }
 
 bool IsGlobalProcessEnvironment(int sysno) {
   switch (sysno) {
     case __NR_acct:         // Privileged.
     case __NR_getrlimit:
+#if defined(__i386__)
+    case __NR_ugetrlimit:
+    case __NR_ulimit:
+#endif
     case __NR_getrusage:
     case __NR_personality:  // Can change its personality as well.
     case __NR_prlimit64:    // Like setrlimit / getrlimit.
     case __NR_setrlimit:
     case __NR_times:
       return true;
     default:
       return false;
   }
 }
 
 bool IsDebug(int sysno) {
   switch (sysno) {
     case __NR_ptrace:
     case __NR_process_vm_readv:
     case __NR_process_vm_writev:
     case __NR_kcmp:
       return true;
     default:
       return false;
   }
 }
 
 bool IsGlobalSystemStatus(int sysno) {
   switch (sysno) {
     case __NR__sysctl:
     case __NR_sysfs:
     case __NR_sysinfo:
     case __NR_uname:
+#if defined(__i386__)
+    case __NR_olduname:
+    case __NR_oldolduname:
+#endif
       return true;
     default:
       return false;
   }
 }
 
 bool IsEventFd(int sysno) {
   switch (sysno) {
     case __NR_eventfd:
     case __NR_eventfd2:
@@ skipping 21 matching lines @@
   switch (sysno) {
     case __NR_add_key:
     case __NR_keyctl:
     case __NR_request_key:
       return true;
     default:
       return false;
   }
 }
 
+#if defined(__x86_64__)
 bool IsSystemVSemaphores(int sysno) {
   switch (sysno) {
     case __NR_semctl:
     case __NR_semget:
     case __NR_semop:
     case __NR_semtimedop:
       return true;
     default:
       return false;
   }
 }
+#endif
 
+#if defined(__x86_64__)
 // These give a lot of ambient authority and bypass the setuid sandbox.
 bool IsAllowedSystemVSharedMemory(int sysno) {
   switch (sysno) {
     case __NR_shmat:
     case __NR_shmctl:
     case __NR_shmdt:
       return true;
     case __NR_shmget:
     default:
       return false;
   }
 }
+#endif
 
+#if defined(__x86_64__)
 bool IsSystemVMessageQueue(int sysno) {
   switch (sysno) {
     case __NR_msgctl:
     case __NR_msgget:
     case __NR_msgrcv:
     case __NR_msgsnd:
       return true;
     default:
       return false;
   }
 }
+#endif
+
+#if defined(__i386__)
+// Big system V multiplexing system call.
+bool IsSystemVIpc(int sysno) {
+  switch (sysno) {
+    case __NR_ipc:
+      return true;
+    default:
+      return false;
+  }
+}
+#endif
 
 bool IsAdvancedScheduler(int sysno) {
   switch (sysno) {
     case __NR_ioprio_get:  // IO scheduler.
     case __NR_ioprio_set:
     case __NR_sched_get_priority_max:
     case __NR_sched_get_priority_min:
     case __NR_sched_getaffinity:
     case __NR_sched_getparam:
     case __NR_sched_getscheduler:
@@ skipping 80 matching lines @@
 // TODO(jln): classify this better.
 bool IsMisc(int sysno) {
   switch (sysno) {
     case __NR_name_to_handle_at:
     case __NR_open_by_handle_at:
     case __NR_perf_event_open:
     case __NR_syncfs:
     case __NR_vhangup:
     // The system calls below are not implemented.
     case __NR_afs_syscall:
+#if defined(__i386__)
+    case __NR_break:
+#endif
     case __NR_getpmsg:
+#if defined(__i386__)
+    case __NR_gtty:
+    case __NR_idle:
+    case __NR_lock:
+    case __NR_mpx:
+    case __NR_prof:
+    case __NR_profil:
+#endif
     case __NR_putpmsg:
+#if defined(__x86_64__)
     case __NR_security:
+#endif
+#if defined(__i386__)
+    case __NR_stty:
+#endif
+#if defined(__x86_64__)
     case __NR_tuxcall:
+#endif
     case __NR_vserver:
       return true;
     default:
       return false;
   }
 }
 
 // End of the system call sets section.
 
-// x86_64 only because it references system calls that are multiplexed on IA32.
 bool IsBaselinePolicyAllowed_x86_64(int sysno) {
   if (IsAllowedAddressSpaceAccess(sysno) ||
       IsAllowedBasicScheduler(sysno) ||
       IsAllowedEpoll(sysno) ||
       IsAllowedFileSystemAccessViaFd(sysno) ||
       IsAllowedGeneralIo(sysno) ||
       IsAllowedGetOrModifySocket(sysno) ||
       IsAllowedGettime(sysno) ||
       IsAllowedPrctl(sysno) ||
       IsAllowedProcessStartOrDeath(sysno) ||
       IsAllowedSignalHandling(sysno) ||
       IsFutex(sysno) ||
       IsGetSimpleId(sysno) ||
       IsKernelInteralApi(sysno) ||
       IsKill(sysno) ||
       IsOperationOnFd(sysno)) {
     return true;
   } else {
     return false;
   }
 }
 
 // System calls that will trigger the crashing sigsys handler.
 bool IsBaselinePolicyWatched_x86_64(int sysno) {
   if (IsAdminOperation(sysno) ||
       IsAdvancedScheduler(sysno) ||
       IsAdvancedTimer(sysno) ||
+#if defined(__x86_64__)
       IsAllowedSystemVSharedMemory(sysno) ||
+#endif
       IsAsyncIo(sysno) ||
       IsDebug(sysno) ||
       IsEventFd(sysno) ||
       IsExtendedAttributes(sysno) ||
       IsFaNotify(sysno) ||
       IsFsControl(sysno) ||
       IsGlobalFSViewChange(sysno) ||
       IsGlobalProcessEnvironment(sysno) ||
       IsGlobalSystemStatus(sysno) ||
       IsInotify(sysno) ||
       IsKernelModule(sysno) ||
       IsKeyManagement(sysno) ||
       IsMessageQueue(sysno) ||
       IsMisc(sysno) ||
+#if defined(__x86_64__)
       IsNetworkSocketInformation(sysno) ||
+#endif
       IsNuma(sysno) ||
       IsProcessGroupOrSession(sysno) ||
       IsProcessPrivilegeChange(sysno) ||
+#if defined(__i386__)
+      IsSocketCall(sysno) ||  // We'll need to handle this properly to build
+                              // a x86_32 policy.
+#endif
+#if defined(__x86_64__)
       IsSystemVMessageQueue(sysno) ||
       IsSystemVSemaphores(sysno) ||
+#elif defined(__i386__)
+      IsSystemVIpc(sysno) ||
+#endif
       IsTimer(sysno)) {
     return true;
   } else {
     return false;
   }
 }
 
+// x86_64 only for now. Needs to be adapted and tested for i386.
 playground2::Sandbox::ErrorCode BaselinePolicy_x86_64(int sysno) {
   if (IsBaselinePolicyAllowed_x86_64(sysno)) {
     return playground2::Sandbox::SB_ALLOWED;
   }
   // TODO(jln): some system calls in those sets are not supposed to
   // return ENOENT. Return the appropriate error.
   if (IsFileSystem(sysno) || IsCurrentDirectory(sysno)) {
     return ENOENT;
   }
 
   if (IsUmask(sysno) || IsDeniedFileSystemAccessViaFd(sysno)) {
     return EPERM;
   }
 
   if (IsBaselinePolicyWatched_x86_64(sysno)) {
     // Previously unseen syscalls. TODO(jln): some of these should
     // be denied gracefully right away.
     return playground2::Sandbox::ErrorCode(CrashSIGSYS_Handler, NULL);
   }
   // In any other case crash the program with our SIGSYS handler
   return playground2::Sandbox::ErrorCode(CrashSIGSYS_Handler, NULL);
 }
 
-// x86_64 only because it references system calls that are multiplexed on IA32.
+// x86_64 only for now. Needs to be adapted and tested for i386.
 playground2::Sandbox::ErrorCode GpuProcessPolicy_x86_64(int sysno) {
   switch(sysno) {
     case __NR_ioctl:
       return playground2::Sandbox::SB_ALLOWED;
+#if defined(__x86_64__)
     case __NR_socket:
       return EACCES;  // Nvidia binary driver.
+#endif
     case __NR_open:
       // Accelerated video decode is enabled by default only on Chrome OS.
       if (IsAcceleratedVideoDecodeEnabled()) {
         // Accelerated video decode needs to open /dev/dri/card0, and
         // dup()'ing an already open file descriptor does not work.
         // Allow open() even though it severely weakens the sandbox,
         // to test the sandboxing mechanism in general.
         // TODO(jorgelo): remove this once we solve the libva issue.
         return playground2::Sandbox::SB_ALLOWED;
       } else {
         // Hook open() in the GPU process to allow opening /etc/drirc,
         // needed by Mesa.
         // The hook needs dup(), lseek(), and close() to be allowed.
         return playground2::Sandbox::ErrorCode(GpuOpenSIGSYS_Handler, NULL);
       }
     default:
       if (IsEventFd(sysno))
         return playground2::Sandbox::SB_ALLOWED;
 
       // Default on the baseline policy.
       return BaselinePolicy_x86_64(sysno);
   }
 }
 
-// x86_64 only because it references system calls that are multiplexed on IA32.
+// x86_64 only for now. Needs to be adapted and tested for i386.
 playground2::Sandbox::ErrorCode FlashProcessPolicy_x86_64(int sysno) {
   switch (sysno) {
     case __NR_sched_getaffinity:
     case __NR_sched_setscheduler:
     case __NR_times:
       return playground2::Sandbox::SB_ALLOWED;
     case __NR_ioctl:
       return ENOTTY;  // Flash Access.
+#if defined(__x86_64__)
     case __NR_socket:
       return EACCES;
+#endif
     default:
+#if defined(__x86_64__)
       // These are under investigation, and hopefully not here for the long
       // term.
       if (IsAllowedSystemVSharedMemory(sysno))
         return playground2::Sandbox::SB_ALLOWED;
+#endif
 
       // Default on the baseline policy.
       return  BaselinePolicy_x86_64(sysno);
   }
 }
-#endif
+#endif  // defined(__x86_64__) || defined(__i386__)
 
 playground2::Sandbox::ErrorCode BlacklistPtracePolicy(int sysno) {
   if (sysno < static_cast<int>(MIN_SYSCALL) ||
       sysno > static_cast<int>(MAX_SYSCALL)) {
     // TODO(jln) we should not have to do that in a trivial policy.
     return ENOSYS;
   }
   switch (sysno) {
     case __NR_migrate_pages:
     case __NR_move_pages:
@@ skipping 132 matching lines @@
       // Process-specific policy.
       ShouldEnableSeccompBpf(process_type) &&
       SupportsSandbox()) {
     return StartBpfSandbox_x86(command_line, process_type);
   }
 #endif
   return false;
 }
 
 }  // namespace content