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

[Sven Vermeulen]

commit:     b287a8016a7ce56c2b9c90df6b9c7da596acdf4b
Author:     Dominick Grift <dominick.grift <AT> gmail <DOT> com>
AuthorDate: Tue Oct 30 09:46:14 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Tue Oct 30 18:32:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=b287a801

Changes to the tuned policy module

Ported from Fedora with changes

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

---
 policy/modules/contrib/tuned.fc |    6 ++++-
 policy/modules/contrib/tuned.if |   31 ++++++++++++++++---------
 policy/modules/contrib/tuned.te |   48 +++++++++++++++++++++++++++++---------
 3 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/policy/modules/contrib/tuned.fc b/policy/modules/contrib/tuned.fc
index 45414db..23ba272 100644
--- a/policy/modules/contrib/tuned.fc
+++ b/policy/modules/contrib/tuned.fc
@@ -1,8 +1,12 @@
 /etc/rc\.d/init\.d/tuned	--	gen_context(system_u:object_r:tuned_initrc_exec_t,s0)
 
+/etc/tuned(/.)?	gen_context(system_u:object_r:tuned_etc_t,s0)
+/etc/tuned/active_profile	--	gen_context(system_u:object_r:tuned_rw_etc_t,s0)
+
 /usr/sbin/tuned	--	gen_context(system_u:object_r:tuned_exec_t,s0)
 
 /var/log/tuned(/.*)?	gen_context(system_u:object_r:tuned_log_t,s0)
-/var/log/tuned\.log	--	gen_context(system_u:object_r:tuned_log_t,s0)
+/var/log/tuned\.log.*	--	gen_context(system_u:object_r:tuned_log_t,s0)
 
+/var/run/tuned(/.*)?	gen_context(system_u:object_r:tuned_var_run_t,s0)
 /var/run/tuned\.pid	--	gen_context(system_u:object_r:tuned_var_run_t,s0)

diff --git a/policy/modules/contrib/tuned.if b/policy/modules/contrib/tuned.if
index 54b8605..e29db63 100644
--- a/policy/modules/contrib/tuned.if
+++ b/policy/modules/contrib/tuned.if
@@ -1,13 +1,13 @@
-## <summary>Dynamic adaptive system tuning daemon</summary>
+## <summary>Dynamic adaptive system tuning daemon.</summary>
 
 ########################################
 ## <summary>
 ##	Execute a domain transition to run tuned.
 ## </summary>
 ## <param name="domain">
-## <summary>
+##	<summary>
 ##	Domain allowed to transition.
-## </summary>
+##	</summary>
 ## </param>
 #
 interface(`tuned_domtrans',`
@@ -15,6 +15,7 @@ interface(`tuned_domtrans',`
 		type tuned_t, tuned_exec_t;
 	')
 
+	corecmd_search_bin($1)
 	domtrans_pattern($1, tuned_exec_t, tuned_t)
 ')
 
@@ -39,7 +40,7 @@ interface(`tuned_exec',`
 
 ######################################
 ## <summary>
-##	Read tuned PID files.
+##	Read tuned pid files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58,7 +59,8 @@ interface(`tuned_read_pid_files',`
 
 #######################################
 ## <summary>
-##	Manage tuned PID files.
+##	Create, read, write, and delete
+##	tuned pid files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77,11 +79,12 @@ interface(`tuned_manage_pid_files',`
 
 ########################################
 ## <summary>
-##	Execute tuned server in the tuned domain.
+##	Execute tuned init scripts in
+##	the initrc domain.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
-##	Domain allowed access.
+##	Domain allowed to transition.
 ##	</summary>
 ## </param>
 #
@@ -95,8 +98,8 @@ interface(`tuned_initrc_domtrans',`
 
 ########################################
 ## <summary>
-##	All of the rules required to administrate 
-##	an tuned environment
+##	All of the rules required to
+##	administrate an tuned environment.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -112,8 +115,8 @@ interface(`tuned_initrc_domtrans',`
 #
 interface(`tuned_admin',`
 	gen_require(`
-		type tuned_t, tuned_var_run_t;
-		type tuned_initrc_exec_t;
+		type tuned_t, tuned_var_run_t, tuned_initrc_exec_t;
+		type tuned_etc_t, tuned_rw_etc_t, tuned_log_t;
 	')
 
 	allow $1 tuned_t:process { ptrace signal_perms };
@@ -124,6 +127,12 @@ interface(`tuned_admin',`
 	role_transition $2 tuned_initrc_exec_t system_r;
 	allow $2 system_r;
 
+	files_search_etc($1)
+	admin_pattern($1, { tuned_etc_t tuned_rw_etc_t })
+
+	logging_search_logs($1)
+	admin_pattern($1, tuned_log_t)
+
 	files_search_pids($1)
 	admin_pattern($1, tuned_var_run_t)
 ')

diff --git a/policy/modules/contrib/tuned.te b/policy/modules/contrib/tuned.te
index 6e0d904..f8d0a7a 100644
--- a/policy/modules/contrib/tuned.te
+++ b/policy/modules/contrib/tuned.te
@@ -1,4 +1,4 @@
-policy_module(tuned, 1.1.1)
+policy_module(tuned, 1.1.2)
 
 ########################################
 #
@@ -12,6 +12,12 @@ init_daemon_domain(tuned_t, tuned_exec_t)
 type tuned_initrc_exec_t;
 init_script_file(tuned_initrc_exec_t)
 
+type tuned_etc_t;
+files_config_file(tuned_etc_t)
+
+type tuned_rw_etc_t;
+files_config_file(tuned_rw_etc_t)
+
 type tuned_log_t;
 logging_log_file(tuned_log_t)
 
@@ -20,46 +26,64 @@ files_pid_file(tuned_var_run_t)
 
 ########################################
 #
-# tuned local policy
+# Local policy
 #
 
+allow tuned_t self:capability { sys_admin sys_nice };
 dontaudit tuned_t self:capability { dac_override sys_tty_config };
+allow tuned_t self:process { setsched signal };
+allow tuned_t self:fifo_file rw_fifo_file_perms;
+
+read_files_pattern(tuned_t, tuned_etc_t, tuned_etc_t)
+
+manage_files_pattern(tuned_t, tuned_etc_t, tuned_rw_etc_t)
 
 manage_dirs_pattern(tuned_t, tuned_log_t, tuned_log_t)
-manage_files_pattern(tuned_t, tuned_log_t, tuned_log_t)
+append_files_pattern(tuned_t, tuned_log_t, tuned_log_t)
+create_files_pattern(tuned_t, tuned_log_t, tuned_log_t)
+setattr_files_pattern(tuned_t, tuned_log_t, tuned_log_t)
 logging_log_filetrans(tuned_t, tuned_log_t, file)
 
 manage_files_pattern(tuned_t, tuned_var_run_t, tuned_var_run_t)
-files_pid_filetrans(tuned_t, tuned_var_run_t, file)
-
-corecmd_exec_shell(tuned_t)
-corecmd_exec_bin(tuned_t)
+manage_dirs_pattern(tuned_t, tuned_var_run_t, tuned_var_run_t)
+files_pid_filetrans(tuned_t, tuned_var_run_t, { dir file })
 
 kernel_read_system_state(tuned_t)
 kernel_read_network_state(tuned_t)
+kernel_read_kernel_sysctls(tuned_t)
+kernel_rw_kernel_sysctl(tuned_t)
+kernel_rw_hotplug_sysctls(tuned_t)
+kernel_rw_vm_sysctls(tuned_t)
 
+corecmd_exec_bin(tuned_t)
+corecmd_exec_shell(tuned_t)
+
+dev_getattr_all_blk_files(tuned_t)
+dev_getattr_all_chr_files(tuned_t)
 dev_read_urand(tuned_t)
-dev_read_sysfs(tuned_t)
-# to allow cpu tuning
+dev_rw_sysfs(tuned_t)
 dev_rw_netcontrol(tuned_t)
 
-files_read_etc_files(tuned_t)
 files_read_usr_files(tuned_t)
 files_dontaudit_search_home(tuned_t)
 files_dontaudit_list_tmp(tuned_t)
 
+fs_getattr_xattr_fs(tuned_t)
+
 logging_send_syslog_msg(tuned_t)
 
 miscfiles_read_localization(tuned_t)
 
 userdom_dontaudit_search_user_home_dirs(tuned_t)
 
-# to allow disk tuning
 optional_policy(`
 	fstools_domtrans(tuned_t)
 ')
 
-# to allow network interface tuning
+optional_policy(`
+	mount_domtrans(tuned_t)
+')
+
 optional_policy(`
 	sysnet_domtrans_ifconfig(tuned_t)
 ')