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

[Jason Zaman]

commit:     25f1cbbdaedcf74f0b7af03fea89063e4e401c0f
Author:     Chris PeBenito <pebenito <AT> ieee <DOT> org>
AuthorDate: Sun Aug 14 18:34:19 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:22:44 2016 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=25f1cbbd

Update alsa module use from Guido Trentalancia.

 policy/modules/services/xserver.fc  | 1 +
 policy/modules/services/xserver.te  | 4 ++++
 policy/modules/system/init.te       | 2 +-
 policy/modules/system/udev.te       | 2 +-
 policy/modules/system/userdomain.if | 4 ++--
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/policy/modules/services/xserver.fc 
b/policy/modules/services/xserver.fc
index a531dba..4cbba44 100644
--- a/policy/modules/services/xserver.fc
+++ b/policy/modules/services/xserver.fc
@@ -75,6 +75,7 @@ HOME_DIR/\.Xauthority.*       --      
gen_context(system_u:object_r:xauth_home_t,s0)
 /usr/lib/xorg/Xorg\.wrap       --      
gen_context(system_u:object_r:xserver_exec_t,s0)
 /usr/lib/xorg-server/Xorg      --      
gen_context(system_u:object_r:xserver_exec_t,s0)
 /usr/lib/xorg-server/Xorg\.wrap        --      
gen_context(system_u:object_r:xserver_exec_t,s0)
+/usr/lib/X11/xdm/Xsession      --      
gen_context(system_u:object_r:xsession_exec_t,s0)
 
 /usr/sbin/lightdm      --      gen_context(system_u:object_r:xdm_exec_t,s0)
 

diff --git a/policy/modules/services/xserver.te 
b/policy/modules/services/xserver.te
index ca4be69..4f9826c 100644
--- a/policy/modules/services/xserver.te
+++ b/policy/modules/services/xserver.te
@@ -507,6 +507,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+       colord_dbus_chat(xdm_t)
+')
+
+optional_policy(`
        consolekit_dbus_chat(xdm_t)
 ')
 

diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te
index 0d4f74a..f646a93 100644
--- a/policy/modules/system/init.te
+++ b/policy/modules/system/init.te
@@ -697,7 +697,7 @@ ifdef(`distro_redhat',`
        miscfiles_read_hwdata(initrc_t)
 
        optional_policy(`
-               alsa_manage_rw_config(initrc_t)
+               alsa_manage_config(initrc_t)
        ')
 
        optional_policy(`

diff --git a/policy/modules/system/udev.te b/policy/modules/system/udev.te
index a7e918b..cc724ea 100644
--- a/policy/modules/system/udev.te
+++ b/policy/modules/system/udev.te
@@ -234,7 +234,7 @@ ifdef(`init_systemd',`
 optional_policy(`
        alsa_domtrans(udev_t)
        alsa_read_lib(udev_t)
-       alsa_read_rw_config(udev_t)
+       alsa_read_config(udev_t)
 ')
 
 optional_policy(`

diff --git a/policy/modules/system/userdomain.if 
b/policy/modules/system/userdomain.if
index f0b4778..534a249 100644
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -603,7 +603,7 @@ template(`userdom_common_user_template',`
        optional_policy(`
                alsa_home_filetrans_alsa_home($1_t, file, ".asoundrc")
                alsa_manage_home_files($1_t)
-               alsa_read_rw_config($1_t)
+               alsa_read_config($1_t)
                alsa_relabel_home_files($1_t)
        ')
 
@@ -982,7 +982,7 @@ template(`userdom_restricted_xwindows_user_template',`
        xserver_restricted_role($1_r, $1_t)
 
        optional_policy(`
-               alsa_read_rw_config($1_t)
+               alsa_read_config($1_t)
        ')
 
        optional_policy(`