From patchwork Thu May 23 10:24:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 10957251 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 46A1F1708 for ; Thu, 23 May 2019 10:24:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EDAA2844C for ; Thu, 23 May 2019 10:24:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2371528451; Thu, 23 May 2019 10:24:59 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C241E2844C for ; Thu, 23 May 2019 10:24:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730542AbfEWKY6 (ORCPT ); Thu, 23 May 2019 06:24:58 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:34169 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727434AbfEWKY6 (ORCPT ); Thu, 23 May 2019 06:24:58 -0400 Received: by mail-wr1-f65.google.com with SMTP id f8so5668908wrt.1 for ; Thu, 23 May 2019 03:24:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qNvXdQPNcpPM9ANBIdmry/EFGlB/yTFPC2GRHV1UuoU=; b=bQsJWWOIVisfcHT2IkySI0J2gbBE5tnP9/hShYep71yuNnM+E4hU5RDaBN8yptUc1l 2U95pE/7VBjzpKhTaJuZHADEBzZTr2/bG0YVFAr/irehDzPKBLGqHLV9JlwUoc3JvF5j kBlmxQvqHci60MJeMVQm9Q+9VDQWMs3+SRgD8XlpbQkkT5Fj4Z9fk9w9VCI51PrqwvIP PVrm+83yCA3TKntrEro/5hYLXevqv01DsEbzXXT5Ph6iTZKKOdcih+mLfo0JiAIyts5n ezJOFL9X5j4mR0vRtiIN5UdkM6ScPIq/ajBU+ntSV7ITel/sVoSMWrJOiXesMkzhQD4/ chEA== X-Gm-Message-State: APjAAAWQSTKfO3aiDjRmPfeUTCgImfNKsD/dnm0RHmnB434kLoRrFk6Q s7jTanoBpYFNWg69jOh1aXzpJ3k1BVQ= X-Google-Smtp-Source: APXvYqx6fVg9rctnR3yC+HAbCs/CATHNMSseAYwKcocdK2N3TUEqXxum5LKdqQbw40wIGEDvs6Cd6w== X-Received: by 2002:adf:afdf:: with SMTP id y31mr55209239wrd.315.1558607096353; Thu, 23 May 2019 03:24:56 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id x22sm10423388wmi.4.2019.05.23.03.24.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 May 2019 03:24:55 -0700 (PDT) From: Ondrej Mosnacek To: selinux@vger.kernel.org Subject: [PATCH userspace 4/4] semodule: add flag to disable policy optimization Date: Thu, 23 May 2019 12:24:49 +0200 Message-Id: <20190523102449.9621-5-omosnace@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190523102449.9621-1-omosnace@redhat.com> References: <20190523102449.9621-1-omosnace@redhat.com> MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Skip binary policy optimization on rebuild when the --no-optimize command-line flag is given. Signed-off-by: Ondrej Mosnacek --- policycoreutils/semodule/semodule.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/policycoreutils/semodule/semodule.c b/policycoreutils/semodule/semodule.c index a76797f5..f490ca2e 100644 --- a/policycoreutils/semodule/semodule.c +++ b/policycoreutils/semodule/semodule.c @@ -46,6 +46,7 @@ static int verbose; static int reload; static int no_reload; static int build; +static int no_optimize; static int disable_dontaudit; static int preserve_tunables; static int ignore_module_cache; @@ -123,8 +124,9 @@ static void usage(char *progname) printf("usage: %s [option]... MODE...\n", progname); printf("Manage SELinux policy modules.\n"); printf("MODES:\n"); - printf(" -R, --reload reload policy\n"); - printf(" -B, --build build and reload policy\n"); + printf(" -R,--reload reload policy\n"); + printf(" -B,--build build and reload policy\n"); + printf(" --no-optimize do not optimize built policy\n"); printf(" -D,--disable_dontaudit Remove dontaudits from policy\n"); printf(" -i,--install=MODULE_PKG install a new module\n"); printf(" -r,--remove=MODULE_NAME remove existing module at desired priority\n"); @@ -191,6 +193,7 @@ static void parse_command_line(int argc, char **argv) {"reload", 0, NULL, 'R'}, {"noreload", 0, NULL, 'n'}, {"build", 0, NULL, 'B'}, + {"no-optimize", 0, NULL, 'O'}, {"disable_dontaudit", 0, NULL, 'D'}, {"preserve_tunables", 0, NULL, 'P'}, {"ignore-module-cache", 0, NULL, 'C'}, @@ -268,6 +271,9 @@ static void parse_command_line(int argc, char **argv) case 'B': build = 1; break; + case 'O': + no_optimize = 1; + break; case 'D': disable_dontaudit = 1; break; @@ -738,6 +744,8 @@ cleanup_disable: semanage_set_reload(sh, 0); if (build) semanage_set_rebuild(sh, 1); + if (no_optimize) + semanage_set_optimize(sh, 0); if (disable_dontaudit) semanage_set_disable_dontaudit(sh, 1); else if (build)