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 4EA34139694 for ; Mon, 5 Jun 2017 17:26:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3EE921C0FA; Mon, 5 Jun 2017 17:25:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 8897A21C0FA for ; Mon, 5 Jun 2017 17:25:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 13ACC341977 for ; Mon, 5 Jun 2017 17:25:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B86D7484 for ; Mon, 5 Jun 2017 17:25:04 +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: <1496682978.cf36b3514d4db2806437cdd1ed63cd328f40a3e2.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/cgmanager.fc policy/modules/contrib/cgmanager.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: cf36b3514d4db2806437cdd1ed63cd328f40a3e2 X-VCS-Branch: master Date: Mon, 5 Jun 2017 17:25:04 +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: 620dd359-ceb6-4e3e-9435-d52dbca8b6ff X-Archives-Hash: 229c1b80ecd612930c857a55105cfd50 commit: cf36b3514d4db2806437cdd1ed63cd328f40a3e2 Author: Chris PeBenito ieee org> AuthorDate: Mon Jun 5 00:30:25 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Mon Jun 5 17:16:18 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=cf36b351 cgmanager: Move lines policy/modules/contrib/cgmanager.fc | 15 ++++++++------- policy/modules/contrib/cgmanager.te | 26 ++++++++++++-------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/policy/modules/contrib/cgmanager.fc b/policy/modules/contrib/cgmanager.fc index d53e92f5..d638d196 100644 --- a/policy/modules/contrib/cgmanager.fc +++ b/policy/modules/contrib/cgmanager.fc @@ -1,9 +1,10 @@ -/usr/sbin/cgmanager -- gen_context(system_u:object_r:cgmanager_exec_t,s0) -/usr/sbin/cgproxy -- gen_context(system_u:object_r:cgmanager_exec_t,s0) -/usr/sbin/cgm-release-agent -- gen_context(system_u:object_r:cgmanager_exec_t,s0) +/sys/fs/cgroup/cgmanager(/.*)? gen_context(system_u:object_r:cgmanager_cgroup_t,s0) -/sys/fs/cgroup/cgmanager(/.*)? gen_context(system_u:object_r:cgmanager_cgroup_t,s0) +/run/cgmanager(/.*)? gen_context(system_u:object_r:cgmanager_run_t,s0) +/run/cgmanager.pid gen_context(system_u:object_r:cgmanager_run_t,s0) +/run/cgmanager/fs(/.*)? <> -/run/cgmanager(/.*)? gen_context(system_u:object_r:cgmanager_run_t,s0) -/run/cgmanager.pid gen_context(system_u:object_r:cgmanager_run_t,s0) -/run/cgmanager/fs(/.*)? <> +/usr/libexec/cgmanager/cgm-release-agent -- gen_context(system_u:object_r:cgmanager_exec_t,s0) + +/usr/sbin/cgmanager -- gen_context(system_u:object_r:cgmanager_exec_t,s0) +/usr/sbin/cgproxy -- gen_context(system_u:object_r:cgmanager_exec_t,s0) diff --git a/policy/modules/contrib/cgmanager.te b/policy/modules/contrib/cgmanager.te index 5c322954..c3cc5217 100644 --- a/policy/modules/contrib/cgmanager.te +++ b/policy/modules/contrib/cgmanager.te @@ -9,12 +9,12 @@ type cgmanager_t; type cgmanager_exec_t; init_daemon_domain(cgmanager_t, cgmanager_exec_t) -type cgmanager_run_t; -files_pid_file(cgmanager_run_t) - type cgmanager_cgroup_t; files_type(cgmanager_cgroup_t) +type cgmanager_run_t; +files_pid_file(cgmanager_run_t) + ######################################## # # CGManager local policy @@ -23,40 +23,38 @@ files_type(cgmanager_cgroup_t) allow cgmanager_t self:capability { sys_admin dac_override }; allow cgmanager_t self:fifo_file rw_fifo_file_perms; +manage_dirs_pattern(cgmanager_t, cgmanager_cgroup_t, cgmanager_cgroup_t) +manage_files_pattern(cgmanager_t, cgmanager_cgroup_t, cgmanager_cgroup_t) +manage_sock_files_pattern(cgmanager_t, cgmanager_cgroup_t, cgmanager_cgroup_t) +fs_cgroup_filetrans(cgmanager_t, cgmanager_cgroup_t, dir, "cgmanager") + +can_exec(cgmanager_t, cgmanager_exec_t) + manage_dirs_pattern(cgmanager_t, cgmanager_run_t, cgmanager_run_t) manage_files_pattern(cgmanager_t, cgmanager_run_t, cgmanager_run_t) manage_lnk_files_pattern(cgmanager_t, cgmanager_run_t, cgmanager_run_t) files_pid_filetrans(cgmanager_t, cgmanager_run_t, { file dir }) allow cgmanager_t cgmanager_run_t:dir mounton; -manage_dirs_pattern(cgmanager_t, cgmanager_cgroup_t, cgmanager_cgroup_t) -manage_files_pattern(cgmanager_t, cgmanager_cgroup_t, cgmanager_cgroup_t) -manage_sock_files_pattern(cgmanager_t, cgmanager_cgroup_t, cgmanager_cgroup_t) -fs_cgroup_filetrans(cgmanager_t, cgmanager_cgroup_t, dir, "cgmanager") - +# for the release agent kernel_domtrans_to(cgmanager_t, cgmanager_exec_t) kernel_read_system_state(cgmanager_t) corecmd_exec_bin(cgmanager_t) -can_exec(cgmanager_t, cgmanager_exec_t) domain_read_all_domains_state(cgmanager_t) files_read_etc_files(cgmanager_t) - # cgmanager unmounts everything in its own mount namespace and mounts tmpfs on some things files_mounton_all_mountpoints(cgmanager_t) files_unmount_all_file_type_fs(cgmanager_t) -fs_unmount_xattr_fs(cgmanager_t) +fs_unmount_xattr_fs(cgmanager_t) fs_manage_cgroup_dirs(cgmanager_t) fs_manage_cgroup_files(cgmanager_t) - fs_getattr_tmpfs(cgmanager_t) - fs_manage_tmpfs_dirs(cgmanager_t) fs_manage_tmpfs_files(cgmanager_t) - fs_mount_cgroup(cgmanager_t) fs_mount_tmpfs(cgmanager_t) fs_mounton_tmpfs(cgmanager_t)