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

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

Issue 197873014: Revert of Implement ScopedFD in terms of ScopedGeneric. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « sandbox/linux/services/scoped_process_unittest.cc ('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>
11 #include <unistd.h> 11 #include <unistd.h>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/file_util.h" 14 #include "base/file_util.h"
15 #include "base/files/scoped_file.h"
16 #include "base/logging.h" 15 #include "base/logging.h"
17 #include "base/posix/eintr_wrapper.h" 16 #include "base/posix/eintr_wrapper.h"
18 17
19 #if !defined(PR_SET_PTRACER_ANY) 18 #if !defined(PR_SET_PTRACER_ANY)
20 #define PR_SET_PTRACER_ANY ((unsigned long)-1) 19 #define PR_SET_PTRACER_ANY ((unsigned long)-1)
21 #endif 20 #endif
22 21
23 #if !defined(PR_SET_PTRACER) 22 #if !defined(PR_SET_PTRACER)
24 #define PR_SET_PTRACER 0x59616d61 23 #define PR_SET_PTRACER 0x59616d61
25 #endif 24 #endif
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 } 71 }
73 72
74 // static 73 // static
75 int Yama::GetStatus() { 74 int Yama::GetStatus() {
76 if (!CanAccessProcFS()) { 75 if (!CanAccessProcFS()) {
77 return 0; 76 return 0;
78 } 77 }
79 78
80 static const char kPtraceScopePath[] = "/proc/sys/kernel/yama/ptrace_scope"; 79 static const char kPtraceScopePath[] = "/proc/sys/kernel/yama/ptrace_scope";
81 80
82 base::ScopedFD yama_scope(open(kPtraceScopePath, O_RDONLY)); 81 int yama_scope = open(kPtraceScopePath, O_RDONLY);
83 82
84 if (!yama_scope.is_valid()) { 83 if (yama_scope < 0) {
85 const int open_errno = errno; 84 const int open_errno = errno;
86 DCHECK(ENOENT == open_errno); 85 DCHECK(ENOENT == open_errno);
87 // The status is known, yama is not present. 86 // The status is known, yama is not present.
88 return STATUS_KNOWN; 87 return STATUS_KNOWN;
89 } 88 }
90 89
90 file_util::ScopedFDCloser yama_scope_closer(&yama_scope);
91 char yama_scope_value = 0; 91 char yama_scope_value = 0;
92 ssize_t num_read = read(yama_scope.get(), &yama_scope_value, 1); 92 ssize_t num_read = read(yama_scope, &yama_scope_value, 1);
93 PCHECK(1 == num_read); 93 PCHECK(1 == num_read);
94 94
95 switch (yama_scope_value) { 95 switch (yama_scope_value) {
96 case '0': 96 case '0':
97 return STATUS_KNOWN | STATUS_PRESENT; 97 return STATUS_KNOWN | STATUS_PRESENT;
98 case '1': 98 case '1':
99 return STATUS_KNOWN | STATUS_PRESENT | STATUS_ENFORCING; 99 return STATUS_KNOWN | STATUS_PRESENT | STATUS_ENFORCING;
100 case '2': 100 case '2':
101 case '3': 101 case '3':
102 return STATUS_KNOWN | STATUS_PRESENT | STATUS_ENFORCING | 102 return STATUS_KNOWN | STATUS_PRESENT | STATUS_ENFORCING |
103 STATUS_STRICT_ENFORCING; 103 STATUS_STRICT_ENFORCING;
104 default: 104 default:
105 NOTREACHED(); 105 NOTREACHED();
106 return 0; 106 return 0;
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 | « sandbox/linux/services/scoped_process_unittest.cc ('k') | tools/android/memdump/memdump.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698