From 69da46ae18cc5e8d0280ad4ae159dac0993a7b5e Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Tue, 7 Feb 2017 18:51:58 -0500 Subject: [PATCH] usrmerge FC fixes from Russell Coker. --- policy/modules/kernel/corecommands.fc | 3 ++- policy/modules/kernel/corecommands.te | 2 +- policy/modules/services/xserver.fc | 12 ++++++++---- policy/modules/services/xserver.te | 2 +- policy/modules/system/sysnetwork.fc | 1 + policy/modules/system/sysnetwork.te | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc index e58a3d201..677f885e4 100644 --- a/policy/modules/kernel/corecommands.fc +++ b/policy/modules/kernel/corecommands.fc @@ -247,7 +247,7 @@ ifdef(`distro_gentoo',` /usr/libexec/openssh/sftp-server -- gen_context(system_u:object_r:bin_t,s0) -/usr/local/bin(/.*)? gen_context(system_u:object_r:bin_t,s0) +/usr/local/(.*/)?bin(/.*)? gen_context(system_u:object_r:bin_t,s0) /usr/local/sbin(/.*)? gen_context(system_u:object_r:bin_t,s0) /usr/local/Brother(/.*)? gen_context(system_u:object_r:bin_t,s0) /usr/local/Printer(/.*)? gen_context(system_u:object_r:bin_t,s0) @@ -261,6 +261,7 @@ ifdef(`distro_gentoo',` /usr/sbin/sesh -- gen_context(system_u:object_r:shell_exec_t,s0) /usr/sbin/smrsh -- gen_context(system_u:object_r:shell_exec_t,s0) +/usr/share/(.*/)?bin(/.*)? gen_context(system_u:object_r:bin_t,s0) /usr/share/ajaxterm/ajaxterm.py.* -- gen_context(system_u:object_r:bin_t,s0) /usr/share/ajaxterm/qweb.py.* -- gen_context(system_u:object_r:bin_t,s0) /usr/share/apr-0/build/[^/]+\.sh -- gen_context(system_u:object_r:bin_t,s0) diff --git a/policy/modules/kernel/corecommands.te b/policy/modules/kernel/corecommands.te index ca4e75f16..a9535774a 100644 --- a/policy/modules/kernel/corecommands.te +++ b/policy/modules/kernel/corecommands.te @@ -1,4 +1,4 @@ -policy_module(corecommands, 1.23.1) +policy_module(corecommands, 1.23.2) ######################################## # diff --git a/policy/modules/services/xserver.fc b/policy/modules/services/xserver.fc index 10d68b451..fd9a4999e 100644 --- a/policy/modules/services/xserver.fc +++ b/policy/modules/services/xserver.fc @@ -61,10 +61,10 @@ HOME_DIR/\.Xauthority.* -- gen_context(system_u:object_r:xauth_home_t,s0) # /usr # -/usr/s?bin/gdm(3)? -- gen_context(system_u:object_r:xdm_exec_t,s0) -/usr/s?bin/gdm-binary -- gen_context(system_u:object_r:xdm_exec_t,s0) -/usr/s?bin/lxdm(-binary)? -- gen_context(system_u:object_r:xdm_exec_t,s0) -/usr/s?bin/[xkw]dm -- gen_context(system_u:object_r:xdm_exec_t,s0) +/usr/bin/gdm(3)? -- gen_context(system_u:object_r:xdm_exec_t,s0) +/usr/bin/gdm-binary -- gen_context(system_u:object_r:xdm_exec_t,s0) +/usr/bin/lxdm(-binary)? -- gen_context(system_u:object_r:xdm_exec_t,s0) +/usr/bin/[xkw]dm -- gen_context(system_u:object_r:xdm_exec_t,s0) /usr/bin/gpe-dm -- gen_context(system_u:object_r:xdm_exec_t,s0) /usr/bin/iceauth -- gen_context(system_u:object_r:iceauth_exec_t,s0) /usr/bin/slim -- gen_context(system_u:object_r:xdm_exec_t,s0) @@ -79,7 +79,11 @@ HOME_DIR/\.Xauthority.* -- gen_context(system_u:object_r:xauth_home_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/[xkw]dm -- gen_context(system_u:object_r:xdm_exec_t,s0) +/usr/sbin/gdm(3)? -- gen_context(system_u:object_r:xdm_exec_t,s0) +/usr/sbin/gdm-binary -- gen_context(system_u:object_r:xdm_exec_t,s0) /usr/sbin/lightdm -- gen_context(system_u:object_r:xdm_exec_t,s0) +/usr/sbin/lxdm(-binary)? -- gen_context(system_u:object_r:xdm_exec_t,s0) # xserver default configure bug: not FHS-compliant because not read-only ! /usr/share/X11/xkb(/.*)? gen_context(system_u:object_r:xkb_var_lib_t,s0) diff --git a/policy/modules/services/xserver.te b/policy/modules/services/xserver.te index 1d8f18982..f7a09799b 100644 --- a/policy/modules/services/xserver.te +++ b/policy/modules/services/xserver.te @@ -1,4 +1,4 @@ -policy_module(xserver, 3.13.0) +policy_module(xserver, 3.13.1) gen_require(` class x_drawable all_x_drawable_perms; diff --git a/policy/modules/system/sysnetwork.fc b/policy/modules/system/sysnetwork.fc index 3ce2bcbcc..4d6732ec7 100644 --- a/policy/modules/system/sysnetwork.fc +++ b/policy/modules/system/sysnetwork.fc @@ -38,6 +38,7 @@ ifdef(`distro_redhat',` /usr/sbin/dhclient.* -- gen_context(system_u:object_r:dhcpc_exec_t,s0) /usr/sbin/dhcdbd -- gen_context(system_u:object_r:dhcpc_exec_t,s0) +/usr/sbin/dhcp6c -- gen_context(system_u:object_r:dhcpc_exec_t,s0) /usr/sbin/dhcpcd -- gen_context(system_u:object_r:dhcpc_exec_t,s0) /usr/sbin/ethtool -- gen_context(system_u:object_r:ifconfig_exec_t,s0) /usr/sbin/ifconfig -- gen_context(system_u:object_r:ifconfig_exec_t,s0) diff --git a/policy/modules/system/sysnetwork.te b/policy/modules/system/sysnetwork.te index b77e7b244..c373a4a96 100644 --- a/policy/modules/system/sysnetwork.te +++ b/policy/modules/system/sysnetwork.te @@ -1,4 +1,4 @@ -policy_module(sysnetwork, 1.20.1) +policy_module(sysnetwork, 1.20.2) ######################################## #