| 1 |
commit: 605d97a8cb4f58a7462fdc85122039810d1af403 |
| 2 |
Author: Chris PeBenito <pebenito <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 8 16:35:57 2014 +0000 |
| 4 |
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 10:52:49 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=605d97a8 |
| 7 |
|
| 8 |
Fix read loopback file interface. |
| 9 |
|
| 10 |
--- |
| 11 |
policy/modules/kernel/kernel.te | 4 ++-- |
| 12 |
policy/modules/system/mount.if | 6 +++--- |
| 13 |
policy/modules/system/mount.te | 4 ++-- |
| 14 |
3 files changed, 7 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/policy/modules/kernel/kernel.te b/policy/modules/kernel/kernel.te |
| 17 |
index b35629d..f6b1062 100644 |
| 18 |
--- a/policy/modules/kernel/kernel.te |
| 19 |
+++ b/policy/modules/kernel/kernel.te |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-policy_module(kernel, 1.17.4) |
| 22 |
+policy_module(kernel, 1.17.5) |
| 23 |
|
| 24 |
######################################## |
| 25 |
# |
| 26 |
@@ -318,7 +318,7 @@ optional_policy(` |
| 27 |
|
| 28 |
optional_policy(` |
| 29 |
mount_use_fds(kernel_t) |
| 30 |
- mount_read_loopback_file(kernel_t) |
| 31 |
+ mount_read_loopback_files(kernel_t) |
| 32 |
') |
| 33 |
|
| 34 |
optional_policy(` |
| 35 |
|
| 36 |
diff --git a/policy/modules/system/mount.if b/policy/modules/system/mount.if |
| 37 |
index cf80631..fe24186 100644 |
| 38 |
--- a/policy/modules/system/mount.if |
| 39 |
+++ b/policy/modules/system/mount.if |
| 40 |
@@ -176,7 +176,7 @@ interface(`mount_run_unconfined',` |
| 41 |
|
| 42 |
######################################## |
| 43 |
## <summary> |
| 44 |
-## Read mount_loopback files. |
| 45 |
+## Read loopback filesystem image files. |
| 46 |
## </summary> |
| 47 |
## <param name="domain"> |
| 48 |
## <summary> |
| 49 |
@@ -184,9 +184,9 @@ interface(`mount_run_unconfined',` |
| 50 |
## </summary> |
| 51 |
## </param> |
| 52 |
# |
| 53 |
-interface(`mount_read_loopback_file',` |
| 54 |
+interface(`mount_read_loopback_files',` |
| 55 |
gen_require(` |
| 56 |
- type mount_t; |
| 57 |
+ type mount_loopback_t; |
| 58 |
') |
| 59 |
|
| 60 |
allow $1 mount_loopback_t:file read_file_perms; |
| 61 |
|
| 62 |
diff --git a/policy/modules/system/mount.te b/policy/modules/system/mount.te |
| 63 |
index 975be3c..8ae8b7c 100644 |
| 64 |
--- a/policy/modules/system/mount.te |
| 65 |
+++ b/policy/modules/system/mount.te |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-policy_module(mount, 1.16.6) |
| 68 |
+policy_module(mount, 1.16.7) |
| 69 |
|
| 70 |
######################################## |
| 71 |
# |
| 72 |
@@ -43,7 +43,7 @@ application_domain(unconfined_mount_t, mount_exec_t) |
| 73 |
# setuid/setgid needed to mount cifs |
| 74 |
allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config setuid setgid }; |
| 75 |
|
| 76 |
-mount_read_loopback_file(mount_t) |
| 77 |
+mount_read_loopback_files(mount_t) |
| 78 |
|
| 79 |
allow mount_t mount_tmp_t:file manage_file_perms; |
| 80 |
allow mount_t mount_tmp_t:dir manage_dir_perms; |
Archives