1 |
commit: 88891e0e6d86f54b792f673cfe29e7bfccc18a8f |
2 |
Author: Jason Zaman <jason <AT> perfinion <DOT> com> |
3 |
AuthorDate: Thu Aug 27 13:26:12 2015 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 27 13:26:12 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=88891e0e |
7 |
|
8 |
switch from ps_process_pattern to allow cgmanager to inspect all processes |
9 |
|
10 |
policy/modules/contrib/cgmanager.if | 8 ++++---- |
11 |
policy/modules/contrib/cgmanager.te | 3 ++- |
12 |
2 files changed, 6 insertions(+), 5 deletions(-) |
13 |
|
14 |
diff --git a/policy/modules/contrib/cgmanager.if b/policy/modules/contrib/cgmanager.if |
15 |
index ef04583..6e24c0d 100644 |
16 |
--- a/policy/modules/contrib/cgmanager.if |
17 |
+++ b/policy/modules/contrib/cgmanager.if |
18 |
@@ -2,9 +2,9 @@ |
19 |
|
20 |
######################################## |
21 |
## <summary> |
22 |
-## Mark the domain as a cgmanager client, automatically granting |
23 |
-## the necessary privileges (connect to cgmanager and allow |
24 |
-## cgmanager to inspect the process). |
25 |
+## Mark the domain as a cgmanager |
26 |
+## client, and grant the stream |
27 |
+## connect privs. |
28 |
## </summary> |
29 |
## <param name="domain"> |
30 |
## <summary> |
31 |
@@ -12,7 +12,7 @@ |
32 |
## </summary> |
33 |
## </param> |
34 |
# |
35 |
-interface(`cgmanager_client_domain',` |
36 |
+interface(`cgmanager_stream_connect',` |
37 |
gen_require(` |
38 |
attribute cgmanager_client; |
39 |
') |
40 |
|
41 |
diff --git a/policy/modules/contrib/cgmanager.te b/policy/modules/contrib/cgmanager.te |
42 |
index d79f506..f6ef7a6 100644 |
43 |
--- a/policy/modules/contrib/cgmanager.te |
44 |
+++ b/policy/modules/contrib/cgmanager.te |
45 |
@@ -42,6 +42,8 @@ kernel_read_system_state(cgmanager_t) |
46 |
corecmd_exec_bin(cgmanager_t) |
47 |
can_exec(cgmanager_t, cgmanager_exec_t) |
48 |
|
49 |
+domain_read_all_domains_state(cgmanager_t) |
50 |
+ |
51 |
files_read_etc_files(cgmanager_t) |
52 |
|
53 |
# cgmanager unmounts everything in its own mount namespace and mounts tmpfs on some things |
54 |
@@ -73,4 +75,3 @@ fs_unmount_tmpfs(cgmanager_t) |
55 |
fs_search_cgroup_dirs(cgmanager_client) |
56 |
list_dirs_pattern(cgmanager_client, cgmanager_cgroup_t, cgmanager_cgroup_t) |
57 |
stream_connect_pattern(cgmanager_client, cgmanager_cgroup_t, cgmanager_cgroup_t, cgmanager_t) |
58 |
-ps_process_pattern(cgmanager_t, cgmanager_client) |