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

Side by Side Diff: sandbox/linux/seccomp-bpf/die.cc

Issue 1099263003: Reland: Introduce sys_sigprocmask and sys_sigaction. (patchset #4 id:80001 of https://codereview.ch… (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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sandbox/linux/seccomp-bpf/die.h" 5 #include "sandbox/linux/seccomp-bpf/die.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <signal.h> 8 #include <signal.h>
9 #include <stdio.h> 9 #include <stdio.h>
10 #include <sys/prctl.h> 10 #include <sys/prctl.h>
11 #include <sys/syscall.h> 11 #include <sys/syscall.h>
12 #include <unistd.h> 12 #include <unistd.h>
13 13
14 #include <string> 14 #include <string>
15 15
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/posix/eintr_wrapper.h" 17 #include "base/posix/eintr_wrapper.h"
18 #include "sandbox/linux/seccomp-bpf/syscall.h" 18 #include "sandbox/linux/seccomp-bpf/syscall.h"
19 #include "sandbox/linux/services/syscall_wrappers.h"
20 #include "sandbox/linux/system_headers/linux_signal.h"
19 21
20 namespace sandbox { 22 namespace sandbox {
21 23
22 void Die::ExitGroup() { 24 void Die::ExitGroup() {
23 // exit_group() should exit our program. After all, it is defined as a 25 // exit_group() should exit our program. After all, it is defined as a
24 // function that doesn't return. But things can theoretically go wrong. 26 // function that doesn't return. But things can theoretically go wrong.
25 // Especially, since we are dealing with system call filters. Continuing 27 // Especially, since we are dealing with system call filters. Continuing
26 // execution would be very bad in most cases where ExitGroup() gets called. 28 // execution would be very bad in most cases where ExitGroup() gets called.
27 // So, we'll try a few other strategies too. 29 // So, we'll try a few other strategies too.
28 Syscall::Call(__NR_exit_group, 1); 30 Syscall::Call(__NR_exit_group, 1);
29 31
30 // We have no idea what our run-time environment looks like. So, signal 32 // We have no idea what our run-time environment looks like. So, signal
31 // handlers might or might not do the right thing. Try to reset settings 33 // handlers might or might not do the right thing. Try to reset settings
32 // to a defined state; but we have not way to verify whether we actually 34 // to a defined state; but we have not way to verify whether we actually
33 // succeeded in doing so. Nonetheless, triggering a fatal signal could help 35 // succeeded in doing so. Nonetheless, triggering a fatal signal could help
34 // us terminate. 36 // us terminate.
35 signal(SIGSEGV, SIG_DFL); 37 struct sigaction sa = {};
38 sa.sa_handler = LINUX_SIG_DFL;
39 sa.sa_flags = LINUX_SA_RESTART;
40 sys_sigaction(LINUX_SIGSEGV, &sa, nullptr);
36 Syscall::Call(__NR_prctl, PR_SET_DUMPABLE, (void*)0, (void*)0, (void*)0); 41 Syscall::Call(__NR_prctl, PR_SET_DUMPABLE, (void*)0, (void*)0, (void*)0);
37 if (*(volatile char*)0) { 42 if (*(volatile char*)0) {
38 } 43 }
39 44
40 // If there is no way for us to ask for the program to exit, the next 45 // If there is no way for us to ask for the program to exit, the next
41 // best thing we can do is to loop indefinitely. Maybe, somebody will notice 46 // best thing we can do is to loop indefinitely. Maybe, somebody will notice
42 // and file a bug... 47 // and file a bug...
43 // We in fact retry the system call inside of our loop so that it will 48 // We in fact retry the system call inside of our loop so that it will
44 // stand out when somebody tries to diagnose the problem by using "strace". 49 // stand out when somebody tries to diagnose the problem by using "strace".
45 for (;;) { 50 for (;;) {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 // probably prefer them over a loop that blocks. 84 // probably prefer them over a loop that blocks.
80 ignore_result( 85 ignore_result(
81 HANDLE_EINTR(Syscall::Call(__NR_write, 2, s.c_str(), s.length()))); 86 HANDLE_EINTR(Syscall::Call(__NR_write, 2, s.c_str(), s.length())));
82 } 87 }
83 } 88 }
84 89
85 bool Die::simple_exit_ = false; 90 bool Die::simple_exit_ = false;
86 bool Die::suppress_info_ = false; 91 bool Die::suppress_info_ = false;
87 92
88 } // namespace sandbox 93 } // namespace sandbox
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698