From 866387dc32849b8a18b2de851a7b14fedfd52ff6 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Mon, 13 Jan 2020 14:05:31 -0500 Subject: [PATCH] Revert "Move pipe, open, and getdents from the APP to COMMON seccomp whitelist." This reverts commit 74cdb253bae513197c5f96545b3c87cd3920e841. Chromium (and thus WebView) no longer uses Breakpad for crash reporting, so the old compat syscalls that were whitelisted for Breakpad can be moved back to the APP list. Test: `am start com.android.settings/.SettingsLicenseActivity` Test: Get the pid of the sandboxed_process0 for the license viewer. Test: Send the process SIGABRT and check logcat for Crashpad log messages. Bug: 115557900 Change-Id: I877ebe6bfabec544e58723b2e9a2f84c9cbf0a57 --- libc/SECCOMP_WHITELIST_APP.TXT | 7 +++++++ libc/SECCOMP_WHITELIST_COMMON.TXT | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libc/SECCOMP_WHITELIST_APP.TXT b/libc/SECCOMP_WHITELIST_APP.TXT index 9aa4260a5..faa2d632c 100644 --- a/libc/SECCOMP_WHITELIST_APP.TXT +++ b/libc/SECCOMP_WHITELIST_APP.TXT @@ -25,10 +25,17 @@ # # This file is processed by a python script named genseccomp.py. +# Needed for debugging 32-bit Chrome +int pipe:pipe(int pipefd[2]) arm,x86,mips + # b/34651972 int access:access(const char *pathname, int mode) arm,x86,mips int stat64:stat64(const char*, struct stat64*) arm,x86,mips +# b/34813887 +int open:open(const char *path, int oflag, ... ) arm,x86,x86_64,mips +int getdents:getdents(unsigned int fd, struct linux_dirent *dirp, unsigned int count) arm,x86,x86_64,mips + # b/34719286 int eventfd:eventfd(unsigned int initval, int flags) arm,x86,mips diff --git a/libc/SECCOMP_WHITELIST_COMMON.TXT b/libc/SECCOMP_WHITELIST_COMMON.TXT index 07f84a8fb..58b2326e3 100644 --- a/libc/SECCOMP_WHITELIST_COMMON.TXT +++ b/libc/SECCOMP_WHITELIST_COMMON.TXT @@ -52,13 +52,6 @@ int tkill:tkill(int tid, int sig) all # b/34763393 int seccomp:seccomp(unsigned int operation, unsigned int flags, void *args) all -# Needed for debugging 32-bit Chrome -int pipe:pipe(int pipefd[2]) arm,x86,mips - -# Needed by breakpad (b/34813887). -int open:open(const char *path, int oflag, ... ) arm,x86,x86_64,mips -int getdents:getdents(unsigned int fd, struct linux_dirent *dirp, unsigned int count) arm,x86,x86_64,mips - # Needed by sanitizers (b/34606909, b/136777266). int open:open(const char*, int, ...) arm,x86,x86_64 int stat64:stat64(const char*, struct stat64*) arm,x86