From patchwork Mon Sep 18 21:32:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 9957689 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 24D6060208 for ; Mon, 18 Sep 2017 21:34:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BE5728D28 for ; Mon, 18 Sep 2017 21:34:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F183128D2F; Mon, 18 Sep 2017 21:34:56 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from uhil19pa11.eemsg.mail.mil (uhil19pa11.eemsg.mail.mil [214.24.21.84]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE5CE28D28 for ; Mon, 18 Sep 2017 21:34:55 +0000 (UTC) Received: from emsm-gh1-uea11.ncsc.mil ([214.29.60.3]) by uhil19pa11.eemsg.mail.mil with ESMTP/TLS/AES256-SHA; 18 Sep 2017 21:34:54 +0000 Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea11.NCSC.MIL with ESMTP; 18 Sep 2017 21:34:51 +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 v8ILYIKS029274; Mon, 18 Sep 2017 17:34:23 -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 v8ILYED9025183 for ; Mon, 18 Sep 2017 17:34:14 -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 v8ILYDVO029267 for ; Mon, 18 Sep 2017 17:34:14 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A1AAAwCiO8BZf3UbGNZcg18ogVUnjwmPA?= =?us-ascii?q?po2E4lzVwECAQEBAQECEwEBCxaIRohhgVIDAQGZVZI3IgKDbYdGgyuCAoFQik+?= =?us-ascii?q?FCB8FoQiCLZIbgiCJWw2GfUiUbYE5gWQyITGFGgELAXiBUHSIHwEBAQ?= X-IPAS-Result: =?us-ascii?q?A1AAAwCiO8BZf3UbGNZcg18ogVUnjwmPApo2E4lzVwECAQE?= =?us-ascii?q?BAQECEwEBCxaIRohhgVIDAQGZVZI3IgKDbYdGgyuCAoFQik+FCB8FoQiCLZIbg?= =?us-ascii?q?iCJWw2GfUiUbYE5gWQyITGFGgELAXiBUHSIHwEBAQ?= X-IronPort-AV: E=Sophos;i="5.42,414,1500955200"; d="scan'208";a="55600" Received: from emsm-gh1-uea11.ncsc.mil ([214.29.60.35]) by goalie.tycho.ncsc.mil with ESMTP; 18 Sep 2017 17:34:09 -0400 Received: from unknown (HELO upbd19pa11.eemsg.mail.mil) ([214.24.27.117]) by emsm-gh1-uea11.NCSC.MIL with ESMTP; 18 Sep 2017 21:34:08 +0000 X-EEMSG-check-005: 0 X-EEMSG-check-006: 000-001;ad7a0e5b-161b-4c5b-8322-28af3effd6bc Authentication-Results: UPDC3CPA04.eemsg.mail.mil; dkim=neutral (message not signed) header.i=none X-EEMSG-check-008: 187505259|UPDC3CPA04_EEMSG_MP20.csd.disa.mil X-EEMSG-SBRS: 3.5 X-EEMSG-ORIG-IP: 129.104.30.34 X-EEMSG-check-002: true X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CiAgAYOcBZhyIeaIFcHQYMgzCBfSePCY8CmjYTiXNCFQECAQEBAQEBARMBAQEKCwkIKC+HaYhhgVIEAawKhBGHRoMrggKBUIpPhQgfBaEIgi2SG4IgiWiGfUiUbYE5NYEvMiExhRoBCwGCSHSIHwEBAQ X-IPAS-Result: A0CiAgAYOcBZhyIeaIFcHQYMgzCBfSePCY8CmjYTiXNCFQECAQEBAQEBARMBAQEKCwkIKC+HaYhhgVIEAawKhBGHRoMrggKBUIpPhQgfBaEIgi2SG4IgiWiGfUiUbYE5NYEvMiExhRoBCwGCSHSIHwEBAQ Received: from mx1.polytechnique.org ([129.104.30.34]) by UPDC3CPA04.eemsg.mail.mil with ESMTP; 18 Sep 2017 21:33:57 +0000 Received: from localhost.localdomain (abo-251-56-69.avi.modulonet.fr [85.69.56.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id E492856476F for ; Mon, 18 Sep 2017 23:32:52 +0200 (CEST) From: Nicolas Iooss To: selinux@tycho.nsa.gov Date: Mon, 18 Sep 2017 23:32:13 +0200 Message-Id: <20170918213213.23160-1-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.14.1 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Mon Sep 18 23:32:53 2017 +0200 (CEST)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org Subject: [PATCH 1/1] sepolicy: do not fail when file_contexts.local or .subs do not exist X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP On a system without any file context customizations, "sepolicy gui" fails to load because it tries to read a non-existent file: FileNotFoundError: [Errno 2] No such file or directory: '/etc/selinux/refpolicy-git/contexts/files/file_contexts.local' Once this issue is fixed, another one is triggered: FileNotFoundError: [Errno 2] No such file or directory: '/etc/selinux/refpolicy-git/contexts/files/file_contexts.subs Use os.path.exists() to prevent trying to open non-existent files. Signed-off-by: Nicolas Iooss --- python/sepolicy/sepolicy/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py index 03742346caf0..14d2ad634d7d 100644 --- a/python/sepolicy/sepolicy/__init__.py +++ b/python/sepolicy/sepolicy/__init__.py @@ -523,6 +523,8 @@ def find_entrypoint_path(exe, exclude_list=[]): def read_file_equiv(edict, fc_path, modify): + if not os.path.exists(fc_path): + return edict fd = open(fc_path, "r") fc = fd.readlines() fd.close() @@ -555,6 +557,8 @@ def get_local_file_paths(fc_path=selinux.selinux_file_context_path()): if local_files: return local_files local_files = [] + if not os.path.exists(fc_path + ".local"): + return [] fd = open(fc_path + ".local", "r") fc = fd.readlines() fd.close()