From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 62575138CE3 for ; Sun, 9 Feb 2014 10:54:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9070DE0AE6; Sun, 9 Feb 2014 10:54:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73974E0ADD for ; Sun, 9 Feb 2014 10:54:39 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 506DE33F97E for ; Sun, 9 Feb 2014 10:54:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 47A0418893 for ; Sun, 9 Feb 2014 10:54:36 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1391943165.888b3e739f286506fbdb064b3ae7cd84c4ffb8a4.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/, policy/modules/kernel/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/kernel/kernel.te policy/modules/system/mount.if policy/modules/system/mount.te X-VCS-Directories: policy/modules/system/ policy/modules/kernel/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 888b3e739f286506fbdb064b3ae7cd84c4ffb8a4 X-VCS-Branch: master Date: Sun, 9 Feb 2014 10:54:36 +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: 5a108c5d-1678-4f2c-8fdd-803f7d629fb9 X-Archives-Hash: 8d4cd871bc1d4d97c928752ffeb36a72 commit: 888b3e739f286506fbdb064b3ae7cd84c4ffb8a4 Author: Chris PeBenito gentoo org> AuthorDate: Sat Feb 8 15:49:47 2014 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Sun Feb 9 10:52:45 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=888b3e73 Rename mount_read_mount_loopback() to mount_read_loopback_file(). Also make kernel block optional since the calls are to a higher layer. --- policy/modules/kernel/kernel.te | 8 +++++--- policy/modules/system/mount.if | 2 +- policy/modules/system/mount.te | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/policy/modules/kernel/kernel.te b/policy/modules/kernel/kernel.te index c47eb45..5fa2926 100644 --- a/policy/modules/kernel/kernel.te +++ b/policy/modules/kernel/kernel.te @@ -287,9 +287,6 @@ files_list_etc(kernel_t) files_list_home(kernel_t) files_read_usr_files(kernel_t) -mount_use_fds(kernel_t) -mount_read_mount_loopback(kernel_t) - mcs_process_set_categories(kernel_t) mls_process_read_up(kernel_t) @@ -320,6 +317,11 @@ optional_policy(` ') optional_policy(` + mount_use_fds(kernel_t) + mount_read_loopback_file(kernel_t) +') + +optional_policy(` nis_use_ypbind(kernel_t) ') diff --git a/policy/modules/system/mount.if b/policy/modules/system/mount.if index 802fd3d..cf80631 100644 --- a/policy/modules/system/mount.if +++ b/policy/modules/system/mount.if @@ -184,7 +184,7 @@ interface(`mount_run_unconfined',` ## ## # -interface(`mount_read_mount_loopback',` +interface(`mount_read_loopback_file',` gen_require(` type mount_t; ') diff --git a/policy/modules/system/mount.te b/policy/modules/system/mount.te index 1b9030a..bf84971 100644 --- a/policy/modules/system/mount.te +++ b/policy/modules/system/mount.te @@ -43,7 +43,7 @@ application_domain(unconfined_mount_t, mount_exec_t) # setuid/setgid needed to mount cifs allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config setuid setgid }; -mount_read_mount_loopback(mount_t) +mount_read_loopback_file(mount_t) allow mount_t mount_tmp_t:file manage_file_perms; allow mount_t mount_tmp_t:dir manage_dir_perms;