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

Side by Side Diff: sandbox/linux/services/yama.cc

Issue 203213005: Add HANDLE_EINTR in some places missing it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac typo Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « content/common/sandbox_mac_system_access_unittest.mm ('k') | tools/android/memdump/memdump.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/services/yama.h" 5 #include "sandbox/linux/services/yama.h"
6 6
7 #include <fcntl.h> 7 #include <fcntl.h>
8 #include <sys/prctl.h> 8 #include <sys/prctl.h>
9 #include <sys/stat.h> 9 #include <sys/stat.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 } 72 }
73 73
74 // static 74 // static
75 int Yama::GetStatus() { 75 int Yama::GetStatus() {
76 if (!CanAccessProcFS()) { 76 if (!CanAccessProcFS()) {
77 return 0; 77 return 0;
78 } 78 }
79 79
80 static const char kPtraceScopePath[] = "/proc/sys/kernel/yama/ptrace_scope"; 80 static const char kPtraceScopePath[] = "/proc/sys/kernel/yama/ptrace_scope";
81 81
82 base::ScopedFD yama_scope(open(kPtraceScopePath, O_RDONLY)); 82 base::ScopedFD yama_scope(HANDLE_EINTR(open(kPtraceScopePath, O_RDONLY)));
83 83
84 if (!yama_scope.is_valid()) { 84 if (!yama_scope.is_valid()) {
85 const int open_errno = errno; 85 const int open_errno = errno;
86 DCHECK(ENOENT == open_errno); 86 DCHECK(ENOENT == open_errno);
87 // The status is known, yama is not present. 87 // The status is known, yama is not present.
88 return STATUS_KNOWN; 88 return STATUS_KNOWN;
89 } 89 }
90 90
91 char yama_scope_value = 0; 91 char yama_scope_value = 0;
92 ssize_t num_read = HANDLE_EINTR(read(yama_scope.get(), &yama_scope_value, 1)); 92 ssize_t num_read = HANDLE_EINTR(read(yama_scope.get(), &yama_scope_value, 1));
(...skipping 14 matching lines...) Expand all
107 } 107 }
108 } 108 }
109 109
110 // static 110 // static
111 bool Yama::IsPresent() { return GetStatus() & STATUS_PRESENT; } 111 bool Yama::IsPresent() { return GetStatus() & STATUS_PRESENT; }
112 112
113 // static 113 // static
114 bool Yama::IsEnforcing() { return GetStatus() & STATUS_ENFORCING; } 114 bool Yama::IsEnforcing() { return GetStatus() & STATUS_ENFORCING; }
115 115
116 } // namespace sandbox 116 } // namespace sandbox
OLDNEW
« no previous file with comments | « content/common/sandbox_mac_system_access_unittest.mm ('k') | tools/android/memdump/memdump.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698