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

[Sven Vermeulen]

commit:     9816ecb58b14813d55811e0fa9f54d50324216c3
Author:     Dominick Grift <dominick.grift <AT> gmail <DOT> com>
AuthorDate: Fri Sep 27 16:28:52 2013 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 19:03:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=9816ecb5

alsa: due to a bug in gnome 3.4, in debian, alsactl does all kinds of weird things related to pulseaudio

Signed-off-by: Dominick Grift <dominick.grift <AT> gmail.com>

---
 policy/modules/contrib/alsa.fc |  4 ++++
 policy/modules/contrib/alsa.te | 25 +++++++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/policy/modules/contrib/alsa.fc b/policy/modules/contrib/alsa.fc
index 5de1e01..33d9d31 100644
--- a/policy/modules/contrib/alsa.fc
+++ b/policy/modules/contrib/alsa.fc
@@ -1,5 +1,9 @@
 HOME_DIR/\.asoundrc	--	gen_context(system_u:object_r:alsa_home_t,s0)
 
+ifdef(`distro_debian',`
+/\.config(/.*)?	gen_context(system_u:object_r:alsa_var_lib_t,s0)
+')
+
 /bin/alsaunmute	--	gen_context(system_u:object_r:alsa_exec_t,s0)
 
 /etc/alsa/asound\.state	--	gen_context(system_u:object_r:alsa_etc_rw_t,s0)

diff --git a/policy/modules/contrib/alsa.te b/policy/modules/contrib/alsa.te
index 595a217..78d134a 100644
--- a/policy/modules/contrib/alsa.te
+++ b/policy/modules/contrib/alsa.te
@@ -20,8 +20,6 @@ files_tmp_file(alsa_tmp_t)
 
 type alsa_tmpfs_t;
 files_tmpfs_file(alsa_tmpfs_t)
-pulseaudio_tmpfs_content(alsa_tmpfs_t)
-dev_associate(alsa_tmpfs_t)
 
 type alsa_var_lib_t;
 files_type(alsa_var_lib_t)
@@ -72,8 +70,6 @@ dev_write_sound(alsa_t)
 files_read_usr_files(alsa_t)
 files_search_var_lib(alsa_t)
 
-fs_list_tmpfs(alsa_t)
-
 term_dontaudit_use_console(alsa_t)
 term_dontaudit_use_generic_ptys(alsa_t)
 term_dontaudit_use_all_ptys(alsa_t)
@@ -90,8 +86,25 @@ userdom_manage_unpriv_user_semaphores(alsa_t)
 userdom_manage_unpriv_user_shared_mem(alsa_t)
 userdom_search_user_home_dirs(alsa_t)
 
-optional_policy(`
-	dbus_read_lib_files(alsa_t)
+ifdef(`distro_debian',`
+	# Gnome 3.4 bug
+	dev_associate(alsa_tmpfs_t)
+
+	allow alsa_t self:capability kill;
+
+	manage_lnk_files_pattern(alsa_t, alsa_var_lib_t, alsa_var_lib_t)
+	files_root_filetrans(alsa_t, alsa_var_lib_t, dir, ".config")
+
+	fs_getattr_tmpfs(alsa_t)
+	fs_list_tmpfs(alsa_t)
+
+	optional_policy(`
+		dbus_read_lib_files(alsa_t)
+	')
+
+	optional_policy(`
+		pulseaudio_tmpfs_content(alsa_tmpfs_t)
+	')
 ')
 
 optional_policy(`