[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/

[Sven Vermeulen]

commit:     4f0d7b11dabef8643cf60cf68376d4085549d079
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Thu Nov  1 20:38:05 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Thu Nov  1 20:38:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=4f0d7b11

Reshuffle Gentoo-specific alsa-changes

---
 policy/modules/contrib/alsa.if |   60 ++++++++++++++++++++--------------------
 policy/modules/contrib/alsa.te |   26 +++++++++--------
 2 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/policy/modules/contrib/alsa.if b/policy/modules/contrib/alsa.if
index f6ca3d4..f46c4a2 100644
--- a/policy/modules/contrib/alsa.if
+++ b/policy/modules/contrib/alsa.if
@@ -2,36 +2,6 @@
 
 ########################################
 ## <summary>
-##	Mark the selected domain as an alsa-capable domain
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain that links with alsa
-##	</summary>
-## </param>
-## <param name="tmpfstype">
-##	<summary>
-##	Tmpfs type used for shared memory of the given domain
-##	</summary>
-## </param>
-#
-interface(`alsa_domain',`
-	gen_require(`
-		attribute alsadomain;
-		attribute alsatmpfsfile;
-	')
-
-	typeattribute $1 alsadomain;
-	typeattribute $2 alsatmpfsfile;
-
-	# Perhaps we can introduce a tunable for the next?
-	allow $1 alsadomain:sem create_sem_perms;
-	allow $1 alsadomain:shm rw_shm_perms;
-	allow $1 alsatmpfsfile:file rw_file_perms;
-')
-
-########################################
-## <summary>
 ##	Role access for alsa.
 ## </summary>
 ## <param name="role">
@@ -286,3 +256,33 @@ interface(`alsa_read_lib',`
 	files_search_var_lib($1)
 	read_files_pattern($1, alsa_var_lib_t, alsa_var_lib_t)
 ')
+
+########################################
+## <summary>
+##	Mark the selected domain as an alsa-capable domain
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain that links with alsa
+##	</summary>
+## </param>
+## <param name="tmpfstype">
+##	<summary>
+##	Tmpfs type used for shared memory of the given domain
+##	</summary>
+## </param>
+#
+interface(`alsa_domain',`
+	gen_require(`
+		attribute alsadomain;
+		attribute alsatmpfsfile;
+	')
+
+	typeattribute $1 alsadomain;
+	typeattribute $2 alsatmpfsfile;
+
+	# Perhaps we can introduce a tunable for the next?
+	allow $1 alsadomain:sem create_sem_perms;
+	allow $1 alsadomain:shm rw_shm_perms;
+	allow $1 alsatmpfsfile:file rw_file_perms;
+')

diff --git a/policy/modules/contrib/alsa.te b/policy/modules/contrib/alsa.te
index 69912f0..59146a2 100644
--- a/policy/modules/contrib/alsa.te
+++ b/policy/modules/contrib/alsa.te
@@ -5,13 +5,9 @@ policy_module(alsa, 1.11.4)
 # Declarations
 #
 
-attribute alsadomain;
-
-attribute alsatmpfsfile;
-
 attribute_role alsa_roles;
 
-type alsa_t, alsadomain;
+type alsa_t;
 type alsa_exec_t;
 init_system_domain(alsa_t, alsa_exec_t)
 role alsa_roles types alsa_t;
@@ -82,14 +78,20 @@ userdom_manage_unpriv_user_semaphores(alsa_t)
 userdom_manage_unpriv_user_shared_mem(alsa_t)
 userdom_search_user_home_dirs(alsa_t)
 
+ifdef(`distro_gentoo',`
+	attribute alsadomain;
+	attribute alsatmpfsfile;
+
+	typeattribute alsa_t alsadomain;
+
+	################################
+	#
+	# alsadomain policy
+	#
+	allow alsadomain self:sem create_sem_perms;
+')
+
 optional_policy(`
 	hal_use_fds(alsa_t)
 	hal_write_log(alsa_t)
 ')
-
-################################
-#
-# alsadomain policy
-#
-# Used by domains that link with alsa libaries
-allow alsadomain self:sem create_sem_perms;