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 80581138010 for ; Tue, 30 Oct 2012 20:25:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 452B721C0D9; Tue, 30 Oct 2012 20:24:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 98F4821C0D5 for ; Tue, 30 Oct 2012 20:24:58 +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 B77DD33D7FE for ; Tue, 30 Oct 2012 20:24:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 115FDE544A for ; Tue, 30 Oct 2012 20:24:55 +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: <1351628472.a87d68a2faa0a075bb115686d31300b1ec0e9aea.SwifT@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/kernel/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/kernel/devices.if X-VCS-Directories: policy/modules/kernel/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: a87d68a2faa0a075bb115686d31300b1ec0e9aea X-VCS-Branch: master Date: Tue, 30 Oct 2012 20:24:55 +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: de8f7b90-60a1-4258-ac06-65c97ddfd63a X-Archives-Hash: 9bf696ba812eb6c43f8448cc453a1926 commit: a87d68a2faa0a075bb115686d31300b1ec0e9aea Author: Chris PeBenito tresys com> AuthorDate: Tue Oct 30 20:11:32 2012 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Tue Oct 30 20:21:12 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=a87d68a2 Rearrange devices interfaces. --- policy/modules/kernel/devices.if | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/policy/modules/kernel/devices.if b/policy/modules/kernel/devices.if index 6c92734..8d2504b 100644 --- a/policy/modules/kernel/devices.if +++ b/policy/modules/kernel/devices.if @@ -4242,7 +4242,7 @@ interface(`dev_read_generic_usb_dev',` ######################################## ## -## Relabel generic the USB devices. +## Read and write generic the USB devices. ## ## ## @@ -4250,17 +4250,17 @@ interface(`dev_read_generic_usb_dev',` ## ## # -interface(`dev_relabel_generic_usb_dev',` +interface(`dev_rw_generic_usb_dev',` gen_require(` - type usb_device_t; + type device_t, usb_device_t; ') - relabel_chr_files_pattern($1, device_t, usb_device_t) + rw_chr_files_pattern($1, device_t, usb_device_t) ') ######################################## ## -## Read and write generic the USB devices. +## Relabel generic the USB devices. ## ## ## @@ -4268,12 +4268,12 @@ interface(`dev_relabel_generic_usb_dev',` ## ## # -interface(`dev_rw_generic_usb_dev',` +interface(`dev_relabel_generic_usb_dev',` gen_require(` - type device_t, usb_device_t; + type usb_device_t; ') - rw_chr_files_pattern($1, device_t, usb_device_t) + relabel_chr_files_pattern($1, device_t, usb_device_t) ') ########################################