Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(939)

Unified Diff: sandbox/linux/services/credentials.cc

Issue 1092153005: Reland: Introduce sys_sigprocmask and sys_sigaction. (patchset #5 id:160001 of https://codereview.c… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/linux/seccomp-bpf/trap_unittest.cc ('k') | sandbox/linux/services/syscall_wrappers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/linux/services/credentials.cc
diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
index b562d8b7c9650806573c2c31e5e4cdb9f25ce5e2..35bb4dcbd73fe99882deaf362dae473b9efd8c56 100644
--- a/sandbox/linux/services/credentials.cc
+++ b/sandbox/linux/services/credentials.cc
@@ -27,16 +27,12 @@
#include "sandbox/linux/services/syscall_wrappers.h"
#include "sandbox/linux/services/thread_helpers.h"
#include "sandbox/linux/system_headers/capability.h"
+#include "sandbox/linux/system_headers/linux_signal.h"
namespace sandbox {
namespace {
-// Signal ABI for some toolchain is incompatible with Linux's. In particular,
-// PNaCl toolchain defines SIGCHLD = 20. So, here, directly define Linux's
-// value.
-const int kLinuxSIGCHLD = 17;
-
bool IsRunningOnValgrind() { return RUNNING_ON_VALGRIND; }
// Checks that the set of RES-uids and the set of RES-gids have
@@ -96,8 +92,8 @@ bool ChrootToSafeEmptyDir() {
#endif
pid = clone(ChrootToSelfFdinfo, stack,
- CLONE_VM | CLONE_VFORK | CLONE_FS | kLinuxSIGCHLD,
- nullptr, nullptr, nullptr, nullptr);
+ CLONE_VM | CLONE_VFORK | CLONE_FS | LINUX_SIGCHLD, nullptr,
+ nullptr, nullptr, nullptr);
PCHECK(pid != -1);
int status = -1;
« no previous file with comments | « sandbox/linux/seccomp-bpf/trap_unittest.cc ('k') | sandbox/linux/services/syscall_wrappers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698