[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/, policy/modules/kernel/

["Sven Vermeulen" <swift@gentoo.org>]

commit:     605d97a8cb4f58a7462fdc85122039810d1af403
Author:     Chris PeBenito <pebenito <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 16:35:57 2014 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 10:52:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=605d97a8

Fix read loopback file interface.

---
 policy/modules/kernel/kernel.te | 4 ++--
 policy/modules/system/mount.if  | 6 +++---
 policy/modules/system/mount.te  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/policy/modules/kernel/kernel.te b/policy/modules/kernel/kernel.te
index b35629d..f6b1062 100644
--- a/policy/modules/kernel/kernel.te
+++ b/policy/modules/kernel/kernel.te
@@ -1,4 +1,4 @@
-policy_module(kernel, 1.17.4)
+policy_module(kernel, 1.17.5)
 
 ########################################
 #
@@ -318,7 +318,7 @@ optional_policy(`
 
 optional_policy(`
 	mount_use_fds(kernel_t)
-	mount_read_loopback_file(kernel_t)
+	mount_read_loopback_files(kernel_t)
 ')
 
 optional_policy(`

diff --git a/policy/modules/system/mount.if b/policy/modules/system/mount.if
index cf80631..fe24186 100644
--- a/policy/modules/system/mount.if
+++ b/policy/modules/system/mount.if
@@ -176,7 +176,7 @@ interface(`mount_run_unconfined',`
 
 ########################################
 ## <summary>
-##	Read mount_loopback files.
+##	Read loopback filesystem image files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -184,9 +184,9 @@ interface(`mount_run_unconfined',`
 ##	</summary>
 ## </param>
 #
-interface(`mount_read_loopback_file',`
+interface(`mount_read_loopback_files',`
 	gen_require(`
-		type mount_t;
+		type mount_loopback_t;
 	')
 
 	allow $1 mount_loopback_t:file read_file_perms;

diff --git a/policy/modules/system/mount.te b/policy/modules/system/mount.te
index 975be3c..8ae8b7c 100644
--- a/policy/modules/system/mount.te
+++ b/policy/modules/system/mount.te
@@ -1,4 +1,4 @@
-policy_module(mount, 1.16.6)
+policy_module(mount, 1.16.7)
 
 ########################################
 #
@@ -43,7 +43,7 @@ application_domain(unconfined_mount_t, mount_exec_t)
 # setuid/setgid needed to mount cifs
 allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config setuid setgid };
 
-mount_read_loopback_file(mount_t)
+mount_read_loopback_files(mount_t)
 
 allow mount_t mount_tmp_t:file manage_file_perms;
 allow mount_t mount_tmp_t:dir manage_dir_perms;