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 C7E17138200 for ; Tue, 30 Oct 2012 18:38:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8DC221C0B6; Tue, 30 Oct 2012 18:36:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0A6B421C0B6 for ; Tue, 30 Oct 2012 18:36:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6693433D8DC for ; Tue, 30 Oct 2012 18:36:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2E63EE543D for ; Tue, 30 Oct 2012 18:36:17 +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: <1351621997.7e6b051d2a11b10ebaac74a40fdb03346d3d11c7.SwifT@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/usbmuxd.fc policy/modules/contrib/usbmuxd.if policy/modules/contrib/usbmuxd.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 7e6b051d2a11b10ebaac74a40fdb03346d3d11c7 X-VCS-Branch: master Date: Tue, 30 Oct 2012 18:36:17 +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: e9d0a4c4-3168-4c34-b717-fd2c22b7b702 X-Archives-Hash: 25a5fc678436263773cb5aae0a680126 commit: 7e6b051d2a11b10ebaac74a40fdb03346d3d11c7 Author: Dominick Grift gmail com> AuthorDate: Tue Oct 30 11:26:15 2012 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Tue Oct 30 18:33:17 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=7e6b051d Changes to the usbmuxd policy module Role attribute Module clean up Signed-off-by: Dominick Grift gmail.com> --- policy/modules/contrib/usbmuxd.fc | 2 +- policy/modules/contrib/usbmuxd.if | 7 ++++--- policy/modules/contrib/usbmuxd.te | 15 ++++++++------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/policy/modules/contrib/usbmuxd.fc b/policy/modules/contrib/usbmuxd.fc index 40b8b8d..220f6ad 100644 --- a/policy/modules/contrib/usbmuxd.fc +++ b/policy/modules/contrib/usbmuxd.fc @@ -1,3 +1,3 @@ /usr/sbin/usbmuxd -- gen_context(system_u:object_r:usbmuxd_exec_t,s0) -/var/run/usbmuxd.* gen_context(system_u:object_r:usbmuxd_var_run_t,s0) +/var/run/usbmuxd.* gen_context(system_u:object_r:usbmuxd_var_run_t,s0) diff --git a/policy/modules/contrib/usbmuxd.if b/policy/modules/contrib/usbmuxd.if index 53792d3..1ec5e99 100644 --- a/policy/modules/contrib/usbmuxd.if +++ b/policy/modules/contrib/usbmuxd.if @@ -1,4 +1,4 @@ -## USB multiplexing daemon for communicating with Apple iPod Touch and iPhone +## USB multiplexing daemon for communicating with Apple iPod Touch and iPhone. ######################################## ## @@ -15,13 +15,14 @@ interface(`usbmuxd_domtrans',` type usbmuxd_t, usbmuxd_exec_t; ') + corecmd_search_bin($1) domtrans_pattern($1, usbmuxd_exec_t, usbmuxd_t) ') ##################################### ## -## Connect to usbmuxd over a unix domain -## stream socket. +## Connect to usbmuxd with a unix +## domain stream socket. ## ## ## diff --git a/policy/modules/contrib/usbmuxd.te b/policy/modules/contrib/usbmuxd.te index 4440aa6..8840be6 100644 --- a/policy/modules/contrib/usbmuxd.te +++ b/policy/modules/contrib/usbmuxd.te @@ -1,25 +1,28 @@ -policy_module(usbmuxd, 1.1.0) +policy_module(usbmuxd, 1.1.1) ######################################## # # Declarations # +attribute_role usbmuxd_roles; +roleattribute system_r usbmuxd_roles; + type usbmuxd_t; type usbmuxd_exec_t; application_domain(usbmuxd_t, usbmuxd_exec_t) -role system_r types usbmuxd_t; +role usbmuxd_roles types usbmuxd_t; type usbmuxd_var_run_t; files_pid_file(usbmuxd_var_run_t) ######################################## # -# usbmuxd local policy +# Local policy # allow usbmuxd_t self:capability { kill setgid setuid }; -allow usbmuxd_t self:process { fork signal signull }; +allow usbmuxd_t self:process { signal signull }; allow usbmuxd_t self:fifo_file rw_fifo_file_perms; manage_dirs_pattern(usbmuxd_t, usbmuxd_var_run_t, usbmuxd_var_run_t) @@ -33,10 +36,8 @@ kernel_read_system_state(usbmuxd_t) dev_read_sysfs(usbmuxd_t) dev_rw_generic_usb_dev(usbmuxd_t) -files_read_etc_files(usbmuxd_t) +auth_use_nsswitch(usbmuxd_t) miscfiles_read_localization(usbmuxd_t) -auth_use_nsswitch(usbmuxd_t) - logging_send_syslog_msg(usbmuxd_t)