From patchwork Sun Jul 3 06:22:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Zaman X-Patchwork-Id: 9211187 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BDC6D60752 for ; Sun, 3 Jul 2016 06:23:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A33CE284A3 for ; Sun, 3 Jul 2016 06:23:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84211285C1; Sun, 3 Jul 2016 06:23:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from emsm-gh1-uea10.nsa.gov (emsm-gh1-uea10.nsa.gov [8.44.101.8]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD8E7284A3 for ; Sun, 3 Jul 2016 06:23:16 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.26,567,1459814400"; d="scan'208";a="15233398" IronPort-PHdr: =?us-ascii?q?9a23=3AqVwxmB+tKicJ0/9uRHKM819IXTAuvvDOBiVQ1KB9?= =?us-ascii?q?1+McTK2v8tzYMVDF4r011RmSDN2dsaoP0bSO+4nbGkU4qa6bt34DdJEeHzQksu?= =?us-ascii?q?4x2zIaPcieFEfgJ+TrZSFpVO5LVVti4m3peRMNQJW2WVTerzWI4CIIHV2nbEwu?= =?us-ascii?q?d7yzQNaZ1Zrvn8mJuLTrKz1SgzS8Zb4gZD6Xli728vcsvI15N6wqwQHIqHYbM8?= =?us-ascii?q?5fxGdvOE7B102kvpT4wYRnuxh0l7phspcYEPayQ6NtVrFcDTI7I0gp9cbrsl/F?= =?us-ascii?q?VgLJ6XwCAUsMlR8dIQHe6xeybJ70uy2y4uh0wy6cFdX7V741XzWl6eFgTxq+23?= =?us-ascii?q?RPDCIw7GyC0p84t6lcuh/04kUnzg=3D=3D?= X-IPAS-Result: =?us-ascii?q?A2GhBQAhrnhX/wHyM5BbgxEtgVK7JSGBd4UrTAEBAQEBAQI?= =?us-ascii?q?CYieCMoEDWz8BBAIPKAYBAQwgDAIDCQIXKQgIAwEtAwEFAQsfCwUYBAGIDgGkW?= =?us-ascii?q?4ExPjGKVIUqAQEFizEIEIQMimkCEQFohQ+OfIocjklkiFclhUYCSI4DMIEPVII?= =?us-ascii?q?IHIFZYQGIDg8XgR4BAQE?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea10.nsa.gov with ESMTP; 03 Jul 2016 06:23:14 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u636NAR8018003; Sun, 3 Jul 2016 02:23:11 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u636M8KR172918 for ; Sun, 3 Jul 2016 02:22:08 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u636M874017946 for ; Sun, 3 Jul 2016 02:22:08 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1AnAgAhrnhXdELcVdFbgxGBf7cnhAiGGIEhTAEBAQEBARMBCgsMCB+FAAEVLgEBNwGBFAEFAVeIDgGkW4ExPjGKVIUqAQEFiwgBKAgQhAyKaXyBfQuDB458ihyOSWSIV4VrAkiOAzCBD4JcHIFZYQGIDoFEAQEB X-IPAS-Result: A1AnAgAhrnhXdELcVdFbgxGBf7cnhAiGGIEhTAEBAQEBARMBCgsMCB+FAAEVLgEBNwGBFAEFAVeIDgGkW4ExPjGKVIUqAQEFiwgBKAgQhAyKaXyBfQuDB458ihyOSWSIV4VrAkiOAzCBD4JcHIFZYQGIDoFEAQEB X-IronPort-AV: E=Sophos;i="5.26,567,1459828800"; d="scan'208";a="5556511" Received: from emsm-gh1-uea10.corp.nsa.gov (HELO emsm-gh1-uea10.nsa.gov) ([10.208.41.36]) by goalie.tycho.ncsc.mil with ESMTP; 03 Jul 2016 02:22:07 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3A5mt24xe51enzbLnO6oqRpDDnlGMj4u6mDksu8pMi?= =?us-ascii?q?zoh2WeGdxc65YB7h7PlgxGXEQZ/co6odzbGH6+a6ASdav87JmUtBWaQEbwUCh8?= =?us-ascii?q?QSkl5oK+++Imq/EsTXaTcnFt9JTl5v8iLzG0FUHMHjew+a+SXqvnYsExnyfTB4?= =?us-ascii?q?Ov7yUtaLyZ/mj6boo9aJPV0ArQH+SIs6FA+xowTVu5teqqpZAYF19CH0pGBVcf?= =?us-ascii?q?9d32JiKAHbtR/94sCt4MwrqHwI6Lpyv/JHBL73e6U+UKxwECUtM2dz4tbi8xbE?= =?us-ascii?q?U1ih/HwZB0cfiR1OSzrM6Rj8FsPzuzD9sMJl1TOUPMv3SrZyUjOnufQ4ACT0gT?= =?us-ascii?q?sKYmZquFrcjdZ92fpW?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0FRAwAhrnhXdELcVdFbgxGBf7cnhAiCD?= =?us-ascii?q?oQKgSFMAQEBAQEBAgIPAQoLDAgfMYIygQNbPwEVLgEBNwGBFAEFAVeIDgGkW4E?= =?us-ascii?q?xPjGKVIUqAQEFiwgBKAgQhAyKaXyBfQuDB458ihyOSWSIV4VrAkiOAzCBD4JcH?= =?us-ascii?q?IFZYQGIDoFEAQEB?= X-IPAS-Result: =?us-ascii?q?A0FRAwAhrnhXdELcVdFbgxGBf7cnhAiCDoQKgSFMAQEBAQE?= =?us-ascii?q?BAgIPAQoLDAgfMYIygQNbPwEVLgEBNwGBFAEFAVeIDgGkW4ExPjGKVIUqAQEFi?= =?us-ascii?q?wgBKAgQhAyKaXyBfQuDB458ihyOSWSIV4VrAkiOAzCBD4JcHIFZYQGIDoFEAQE?= =?us-ascii?q?B?= X-IronPort-AV: E=Sophos;i="5.26,567,1459814400"; d="scan'208";a="15233389" Received: from mail-pa0-f66.google.com ([209.85.220.66]) by emsm-gh1-uea10.nsa.gov with ESMTP/TLS/AES128-GCM-SHA256; 03 Jul 2016 06:22:06 +0000 Received: by mail-pa0-f66.google.com with SMTP id lm4so1905056pab.3 for ; Sat, 02 Jul 2016 23:22:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=perfinion-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=tAuROJsQBfnI97vhowuywzPVMJSnqoHR42C2yOmH9rQ=; b=LmNsLEHPnSqu+QYscxGhItomgp9PzFTulgFXi5lV4Bvcx2gedXml/EffFkzzq4mUvm xCqW2+Rbx7RzvrRO4gUIYuV9yfuaPN3sCNeDo+ogsS/P4GkBC4f4EQNtLA8FyRO1metR fSfWrQwojeiGftmduIQS/IxO2/Pb+P2DXoBbG73XcjuoF+gBsgbIoOkKVY7FTbgxy+1x UYGgJneqoFWiWDqdkkwZKs++LwNSnqhTp195JDHY+BIqqAhGmQsEYyXVAHxVDkYcyapw cNvJoOxbj/JCUSnc/CUfco67ZYhQjvfsI/tqxUDR/c2rl4i3lYj60IrtxzHrWlri4ihT seUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=tAuROJsQBfnI97vhowuywzPVMJSnqoHR42C2yOmH9rQ=; b=R9454h1/NYSIsVvzhYJbcNgZ1akGj6rcXv2u5GLF0wLGxSzEtaNnfp2qpDcZpCtDms R252z3JNlMgzlqaGyPz9IicVX0ZusVlO94KVPCZI8eOm6rzyKsKCrMddq//1Qm6CmX5D gjH1SkBFSBSVT+Q8ua2ojr+HNtEgFxAqRM2DxfC+A8Gb7JNGjxxgSn8bYy5iQtB1Kn/l F0pagHJxWZP893dCPEjUKofArrEnhKWOpCQsWCY0kDRSHar0ZsAP77UnLd2yvHYoZHkN zUKJ3OJUDN2WEtpskObZ5Nw2D34DGpEV3dhVDxpE5fF5p8fEO5JuuD2KPnkMx1TYaSic 8ueA== X-Gm-Message-State: ALyK8tKV5HtAE+1GA1ALchxD1szO8n9kw55SpwH7tkPWwrfWUc8wfSYmwvE74T6GsMwO3Q== X-Received: by 10.66.179.168 with SMTP id dh8mr11643870pac.36.1467526925959; Sat, 02 Jul 2016 23:22:05 -0700 (PDT) Received: from localhost ([2404:e800:e600:9ab:55de:35ce:f10:570b]) by smtp.gmail.com with ESMTPSA id z88sm1606980pfa.59.2016.07.02.23.22.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jul 2016 23:22:05 -0700 (PDT) From: Jason Zaman To: selinux@tycho.nsa.gov Subject: [PATCH] libselinux: Add openrc_contexts functions Date: Sun, 3 Jul 2016 14:22:02 +0800 Message-Id: <1467526922-19922-1-git-send-email-jason@perfinion.com> X-Mailer: git-send-email 2.7.3 X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP --- libselinux/src/file_path_suffixes.h | 1 + libselinux/src/selinux_config.c | 10 +++++++++- libselinux/src/selinux_internal.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libselinux/src/file_path_suffixes.h b/libselinux/src/file_path_suffixes.h index 95b228b..2d3ca49 100644 --- a/libselinux/src/file_path_suffixes.h +++ b/libselinux/src/file_path_suffixes.h @@ -23,6 +23,7 @@ S_(BINPOLICY, "/policy/policy") S_(VIRTUAL_DOMAIN, "/contexts/virtual_domain_context") S_(VIRTUAL_IMAGE, "/contexts/virtual_image_context") S_(LXC_CONTEXTS, "/contexts/lxc_contexts") + S_(OPENRC_CONTEXTS, "/contexts/openrc_contexts") S_(OPENSSH_CONTEXTS, "/contexts/openssh_contexts") S_(SNAPPERD_CONTEXTS, "/contexts/snapperd_contexts") S_(SYSTEMD_CONTEXTS, "/contexts/systemd_contexts") diff --git a/libselinux/src/selinux_config.c b/libselinux/src/selinux_config.c index c519a77..88bcc85 100644 --- a/libselinux/src/selinux_config.c +++ b/libselinux/src/selinux_config.c @@ -51,7 +51,8 @@ #define OPENSSH_CONTEXTS 28 #define SYSTEMD_CONTEXTS 29 #define SNAPPERD_CONTEXTS 30 -#define NEL 31 +#define OPENRC_CONTEXTS 31 +#define NEL 32 /* Part of one-time lazy init */ static pthread_once_t once = PTHREAD_ONCE_INIT; @@ -493,6 +494,13 @@ const char *selinux_lxc_contexts_path(void) hidden_def(selinux_lxc_contexts_path) +const char *selinux_openrc_contexts_path(void) +{ + return get_path(OPENRC_CONTEXTS); +} + +hidden_def(selinux_openrc_contexts_path) + const char *selinux_openssh_contexts_path(void) { return get_path(OPENSSH_CONTEXTS); diff --git a/libselinux/src/selinux_internal.h b/libselinux/src/selinux_internal.h index 9b9145c..3d5c9fb 100644 --- a/libselinux/src/selinux_internal.h +++ b/libselinux/src/selinux_internal.h @@ -83,6 +83,7 @@ hidden_proto(selinux_mkload_policy) hidden_proto(selinux_media_context_path) hidden_proto(selinux_x_context_path) hidden_proto(selinux_sepgsql_context_path) + hidden_proto(selinux_openrc_contexts_path) hidden_proto(selinux_openssh_contexts_path) hidden_proto(selinux_snapperd_contexts_path) hidden_proto(selinux_systemd_contexts_path)