From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EBFE5139085 for ; Mon, 23 Jan 2017 15:44:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16D592241BD; Mon, 23 Jan 2017 15:44:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D680A2241BB for ; Mon, 23 Jan 2017 15:44:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B11543416A3 for ; Mon, 23 Jan 2017 15:44:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 533932D15 for ; Mon, 23 Jan 2017 15:44:19 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1485176165.045e19bda47a4abb2725672b0da50dafaaf85739.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/exim.fc policy/modules/contrib/exim.if policy/modules/contrib/exim.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 045e19bda47a4abb2725672b0da50dafaaf85739 X-VCS-Branch: master Date: Mon, 23 Jan 2017 15:44:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2af4cba1-c8ba-47b4-a8f3-2e29a477099b X-Archives-Hash: 3077c5294cde7ca114fc31df7aaa7e90 commit: 045e19bda47a4abb2725672b0da50dafaaf85739 Author: cgzones googlemail com> AuthorDate: Thu Jan 5 19:12:45 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Mon Jan 23 12:56:05 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=045e19bd update exim module policy/modules/contrib/exim.fc | 14 +++++++------- policy/modules/contrib/exim.if | 8 ++++---- policy/modules/contrib/exim.te | 25 +++++++++++++------------ 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/policy/modules/contrib/exim.fc b/policy/modules/contrib/exim.fc index 9e04a0d..842cb34 100644 --- a/policy/modules/contrib/exim.fc +++ b/policy/modules/contrib/exim.fc @@ -1,13 +1,13 @@ /etc/rc\.d/init\.d/exim[0-9]? -- gen_context(system_u:object_r:exim_initrc_exec_t,s0) -/usr/sbin/exim[0-9]? -- gen_context(system_u:object_r:exim_exec_t,s0) -/usr/sbin/exim_tidydb -- gen_context(system_u:object_r:exim_exec_t,s0) +/run/exim[0-9]?(/.*)? gen_context(system_u:object_r:exim_pid_t,s0) +/run/exim[0-9]?\.pid -- gen_context(system_u:object_r:exim_pid_t,s0) -/var/lib/exim[0-9]?(/.*)? gen_context(system_u:object_r:exim_var_lib_t,s0) +/usr/sbin/exim[0-9]? -- gen_context(system_u:object_r:exim_exec_t,s0) +/usr/sbin/exim_tidydb -- gen_context(system_u:object_r:exim_exec_t,s0) -/var/log/exim[0-9]?(/.*)? gen_context(system_u:object_r:exim_log_t,s0) +/var/lib/exim[0-9]?(/.*)? gen_context(system_u:object_r:exim_var_lib_t,s0) -/run/exim[0-9]?(/.*)? gen_context(system_u:object_r:exim_var_run_t,s0) -/run/exim[0-9]?\.pid -- gen_context(system_u:object_r:exim_var_run_t,s0) +/var/log/exim[0-9]?(/.*)? gen_context(system_u:object_r:exim_log_t,s0) -/var/spool/exim[0-9]?(/.*)? gen_context(system_u:object_r:exim_spool_t,s0) +/var/spool/exim[0-9]?(/.*)? gen_context(system_u:object_r:exim_spool_t,s0) diff --git a/policy/modules/contrib/exim.if b/policy/modules/contrib/exim.if index 51655bb..c75f5fa 100644 --- a/policy/modules/contrib/exim.if +++ b/policy/modules/contrib/exim.if @@ -96,10 +96,10 @@ interface(`exim_read_tmp_files',` # interface(`exim_read_pid_files',` gen_require(` - type exim_var_run_t; + type exim_pid_t; ') - allow $1 exim_var_run_t:file read_file_perms; + allow $1 exim_pid_t:file read_file_perms; files_search_pids($1) ') @@ -281,7 +281,7 @@ interface(`exim_manage_var_lib_files',` interface(`exim_admin',` gen_require(` type exim_t, exim_spool_t, exim_log_t; - type exim_var_run_t, exim_initrc_exec_t, exim_tmp_t; + type exim_pid_t, exim_initrc_exec_t, exim_tmp_t; type exim_keytab_t; ') @@ -300,7 +300,7 @@ interface(`exim_admin',` admin_pattern($1, exim_log_t) files_search_pids($1) - admin_pattern($1, exim_var_run_t) + admin_pattern($1, exim_pid_t) files_search_tmp($1) admin_pattern($1, exim_tmp_t) diff --git a/policy/modules/contrib/exim.te b/policy/modules/contrib/exim.te index b8de337..5f2810f 100644 --- a/policy/modules/contrib/exim.te +++ b/policy/modules/contrib/exim.te @@ -54,17 +54,18 @@ files_type(exim_var_lib_t) type exim_log_t; logging_log_file(exim_log_t) +type exim_pid_t; +typealias exim_pid_t alias exim_var_run_t; +files_pid_file(exim_pid_t) + type exim_spool_t; files_type(exim_spool_t) type exim_tmp_t; files_tmp_file(exim_tmp_t) -type exim_var_run_t; -files_pid_file(exim_var_run_t) - ifdef(`distro_debian',` - init_daemon_pid_file(exim_var_run_t, dir, "exim4") + init_daemon_pid_file(exim_pid_t, dir, "exim4") ') ######################################## @@ -72,21 +73,25 @@ ifdef(`distro_debian',` # Local policy # -allow exim_t self:capability { chown dac_override dac_read_search fowner setuid setgid sys_resource }; +allow exim_t self:capability { chown dac_override fowner setuid setgid sys_resource }; allow exim_t self:process { setrlimit setpgid }; allow exim_t self:fifo_file rw_fifo_file_perms; allow exim_t self:unix_stream_socket { accept listen }; allow exim_t self:tcp_socket { accept listen }; -allow exim_t exim_keytab_t:file read_file_perms; +can_exec(exim_t, exim_exec_t) -manage_files_pattern(exim_t, exim_var_lib_t, exim_var_lib_t) +allow exim_t exim_keytab_t:file read_file_perms; append_files_pattern(exim_t, exim_log_t, exim_log_t) create_files_pattern(exim_t, exim_log_t, exim_log_t) setattr_files_pattern(exim_t, exim_log_t, exim_log_t) logging_log_filetrans(exim_t, exim_log_t, file) +manage_dirs_pattern(exim_t, exim_pid_t, exim_pid_t) +manage_files_pattern(exim_t, exim_pid_t, exim_pid_t) +files_pid_filetrans(exim_t, exim_pid_t, { dir file }) + manage_dirs_pattern(exim_t, exim_spool_t, exim_spool_t) manage_files_pattern(exim_t, exim_spool_t, exim_spool_t) manage_sock_files_pattern(exim_t, exim_spool_t, exim_spool_t) @@ -96,11 +101,7 @@ manage_dirs_pattern(exim_t, exim_tmp_t, exim_tmp_t) manage_files_pattern(exim_t, exim_tmp_t, exim_tmp_t) files_tmp_filetrans(exim_t, exim_tmp_t, { dir file }) -manage_dirs_pattern(exim_t, exim_var_run_t, exim_var_run_t) -manage_files_pattern(exim_t, exim_var_run_t, exim_var_run_t) -files_pid_filetrans(exim_t, exim_var_run_t, { dir file }) - -can_exec(exim_t, exim_exec_t) +manage_files_pattern(exim_t, exim_var_lib_t, exim_var_lib_t) kernel_read_crypto_sysctls(exim_t) kernel_read_kernel_sysctls(exim_t)