1 |
commit: 2660dc2c8c1c68742a9f57f53b6389b9fc5b810b |
2 |
Author: Nicolas Iooss <nicolas.iooss <AT> m4x <DOT> org> |
3 |
AuthorDate: Fri May 23 18:18:10 2014 +0000 |
4 |
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 28 15:39:01 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=2660dc2c |
7 |
|
8 |
No longer use deprecated MLS interfaces |
9 |
|
10 |
Since commit 2d0c9cec mls_file_read_up and mls_file_write_down |
11 |
interfaces are deprecated even though they are still present. |
12 |
|
13 |
Replace mls_file_read_up with mls_file_read_all_levels and |
14 |
mls_file_write_down with mls_file_write_all_levels. |
15 |
|
16 |
--- |
17 |
policy/modules/kernel/kernel.te | 4 ++-- |
18 |
policy/modules/roles/secadm.te | 2 +- |
19 |
policy/modules/roles/sysadm.te | 2 +- |
20 |
policy/modules/system/init.te | 6 +++--- |
21 |
policy/modules/system/setrans.te | 2 +- |
22 |
policy/modules/system/udev.te | 2 +- |
23 |
policy/modules/system/userdomain.if | 2 +- |
24 |
7 files changed, 10 insertions(+), 10 deletions(-) |
25 |
|
26 |
diff --git a/policy/modules/kernel/kernel.te b/policy/modules/kernel/kernel.te |
27 |
index 196c2c2..b56ffce 100644 |
28 |
--- a/policy/modules/kernel/kernel.te |
29 |
+++ b/policy/modules/kernel/kernel.te |
30 |
@@ -289,8 +289,8 @@ files_read_usr_files(kernel_t) |
31 |
|
32 |
mcs_process_set_categories(kernel_t) |
33 |
|
34 |
-mls_process_read_up(kernel_t) |
35 |
-mls_process_write_down(kernel_t) |
36 |
+mls_process_read_all_levels(kernel_t) |
37 |
+mls_process_write_all_levels(kernel_t) |
38 |
mls_file_write_all_levels(kernel_t) |
39 |
mls_file_read_all_levels(kernel_t) |
40 |
|
41 |
|
42 |
diff --git a/policy/modules/roles/secadm.te b/policy/modules/roles/secadm.te |
43 |
index da11120..2da0b26 100644 |
44 |
--- a/policy/modules/roles/secadm.te |
45 |
+++ b/policy/modules/roles/secadm.te |
46 |
@@ -23,7 +23,7 @@ dev_relabel_all_dev_nodes(secadm_t) |
47 |
|
48 |
domain_obj_id_change_exemption(secadm_t) |
49 |
|
50 |
-mls_process_read_up(secadm_t) |
51 |
+mls_process_read_all_levels(secadm_t) |
52 |
mls_file_read_all_levels(secadm_t) |
53 |
mls_file_write_all_levels(secadm_t) |
54 |
mls_file_upgrade(secadm_t) |
55 |
|
56 |
diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te |
57 |
index 4acf417..c826abf 100644 |
58 |
--- a/policy/modules/roles/sysadm.te |
59 |
+++ b/policy/modules/roles/sysadm.te |
60 |
@@ -27,7 +27,7 @@ ifndef(`enable_mls',` |
61 |
|
62 |
corecmd_exec_shell(sysadm_t) |
63 |
|
64 |
-mls_process_read_up(sysadm_t) |
65 |
+mls_process_read_all_levels(sysadm_t) |
66 |
|
67 |
ubac_process_exempt(sysadm_t) |
68 |
ubac_file_exempt(sysadm_t) |
69 |
|
70 |
diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te |
71 |
index 20d17da..d84f199 100644 |
72 |
--- a/policy/modules/system/init.te |
73 |
+++ b/policy/modules/system/init.te |
74 |
@@ -154,7 +154,7 @@ mcs_killall(init_t) |
75 |
|
76 |
mls_file_read_all_levels(init_t) |
77 |
mls_file_write_all_levels(init_t) |
78 |
-mls_process_write_down(init_t) |
79 |
+mls_process_write_all_levels(init_t) |
80 |
mls_fd_use_all_levels(init_t) |
81 |
|
82 |
selinux_set_all_booleans(init_t) |
83 |
@@ -385,8 +385,8 @@ mcs_process_set_categories(initrc_t) |
84 |
|
85 |
mls_file_read_all_levels(initrc_t) |
86 |
mls_file_write_all_levels(initrc_t) |
87 |
-mls_process_read_up(initrc_t) |
88 |
-mls_process_write_down(initrc_t) |
89 |
+mls_process_read_all_levels(initrc_t) |
90 |
+mls_process_write_all_levels(initrc_t) |
91 |
mls_rangetrans_source(initrc_t) |
92 |
mls_fd_share_all_levels(initrc_t) |
93 |
|
94 |
|
95 |
diff --git a/policy/modules/system/setrans.te b/policy/modules/system/setrans.te |
96 |
index d98b5b2..5dba88e 100644 |
97 |
--- a/policy/modules/system/setrans.te |
98 |
+++ b/policy/modules/system/setrans.te |
99 |
@@ -68,7 +68,7 @@ mls_file_read_all_levels(setrans_t) |
100 |
mls_file_write_all_levels(setrans_t) |
101 |
mls_net_receive_all_levels(setrans_t) |
102 |
mls_socket_write_all_levels(setrans_t) |
103 |
-mls_process_read_up(setrans_t) |
104 |
+mls_process_read_all_levels(setrans_t) |
105 |
mls_socket_read_all_levels(setrans_t) |
106 |
|
107 |
selinux_compute_access_vector(setrans_t) |
108 |
|
109 |
diff --git a/policy/modules/system/udev.te b/policy/modules/system/udev.te |
110 |
index 95ad555..49a6ca3 100644 |
111 |
--- a/policy/modules/system/udev.te |
112 |
+++ b/policy/modules/system/udev.te |
113 |
@@ -130,7 +130,7 @@ mls_file_read_all_levels(udev_t) |
114 |
mls_file_write_all_levels(udev_t) |
115 |
mls_file_upgrade(udev_t) |
116 |
mls_file_downgrade(udev_t) |
117 |
-mls_process_write_down(udev_t) |
118 |
+mls_process_write_all_levels(udev_t) |
119 |
|
120 |
selinux_get_fs_mount(udev_t) |
121 |
selinux_validate_context(udev_t) |
122 |
|
123 |
diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if |
124 |
index 2f51389..3cec4f1 100644 |
125 |
--- a/policy/modules/system/userdomain.if |
126 |
+++ b/policy/modules/system/userdomain.if |
127 |
@@ -1283,7 +1283,7 @@ template(`userdom_security_admin_template',` |
128 |
# Necessary for managing /boot/efi |
129 |
fs_manage_dos_files($1) |
130 |
|
131 |
- mls_process_read_up($1) |
132 |
+ mls_process_read_all_levels($1) |
133 |
mls_file_read_all_levels($1) |
134 |
mls_file_upgrade($1) |
135 |
mls_file_downgrade($1) |