From patchwork Wed May 29 07:37:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 10966275 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 659E7933 for ; Wed, 29 May 2019 07:38:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5922F21FAC for ; Wed, 29 May 2019 07:38:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DE8F287DC; Wed, 29 May 2019 07:38:09 +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 E676C21FAC for ; Wed, 29 May 2019 07:38:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726502AbfE2HiI (ORCPT ); Wed, 29 May 2019 03:38:08 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:38060 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726515AbfE2HiI (ORCPT ); Wed, 29 May 2019 03:38:08 -0400 Received: by mail-wr1-f66.google.com with SMTP id d18so914771wrs.5 for ; Wed, 29 May 2019 00:38:07 -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=19iPoGpOiSMwycDnEvf8l/yr1xOm+2SSCbxvSVojWOw=; b=ttOrbI5cGcBuxK9jgRJHIxKqk0ck92cvR/hucsP27f2zaoy0gY+s420E7CGo+G2qp9 cH9uj9zPIfMtKZJBO08Bjw4KKtx3WMuft5ZjOcTjIldJHUBAE0LOgj+5gdubZH4mkYMF QdtLFG8Q48xf1D/U6mHkeElIxng+ZQvHQI9LOUlG73A90/7+1YyUX0F4kbQdgOfgesC0 ZQMMowu+tW0i/yOG+PzTgGauAJnLiHh3K7/D+3RioHfu22MTlDVOXIHS4nu3ZNtiOd2a Gph7KJm5x/Lcu/RTL8J70P1h6Y4LctQKX/wm7xJY2qO7tjF1r3j3n8HLGKCbw662WI0T 1ZPg== X-Gm-Message-State: APjAAAUOKv536cLE5R34qsACIKxeTF0HBvCcItB7KKmZm6PQSNHWbAwT 4K+vmB5lqv5wARg7XA7K9uuUA0mgtrE= X-Google-Smtp-Source: APXvYqyLaGVFHjTdOxyyjQfjTtqKGTKnmcteHjTHSeinE4a8IzV4+/QudT+kGg1CQLfoDcAPam3Chg== X-Received: by 2002:adf:8306:: with SMTP id 6mr67874939wrd.155.1559115486436; Wed, 29 May 2019 00:38:06 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id p16sm32024877wrg.49.2019.05.29.00.38.05 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 May 2019 00:38:05 -0700 (PDT) From: Ondrej Mosnacek To: selinux@vger.kernel.org Subject: [PATCH userspace v3 3/7] semodule: add flag to enable policy optimization Date: Wed, 29 May 2019 09:37:55 +0200 Message-Id: <20190529073759.20548-4-omosnace@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190529073759.20548-1-omosnace@redhat.com> References: <20190529073759.20548-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 Add a command-line option -O/--optimize to enable policy optimization when building kernel policy. Signed-off-by: Ondrej Mosnacek --- policycoreutils/semodule/semodule.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/policycoreutils/semodule/semodule.c b/policycoreutils/semodule/semodule.c index a76797f5..40314117 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 optimize; static int disable_dontaudit; static int preserve_tunables; static int ignore_module_cache; @@ -123,9 +124,10 @@ 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(" -D,--disable_dontaudit Remove dontaudits from policy\n"); + printf(" -O,--optimize optimize built policy\n"); printf(" -i,--install=MODULE_PKG install a new module\n"); printf(" -r,--remove=MODULE_NAME remove existing module at desired priority\n"); printf(" -l[KIND],--list-modules[=KIND] display list of installed modules\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'}, + {"optimize", 0, NULL, 'O'}, {"disable_dontaudit", 0, NULL, 'D'}, {"preserve_tunables", 0, NULL, 'P'}, {"ignore-module-cache", 0, NULL, 'C'}, @@ -207,9 +210,10 @@ static void parse_command_line(int argc, char **argv) verbose = 0; reload = 0; no_reload = 0; + optimize = 0; priority = 400; while ((i = - getopt_long(argc, argv, "s:b:hi:l::vr:u:RnNBDCPX:e:d:p:S:E:cH", opts, + getopt_long(argc, argv, "s:b:hi:l::vr:u:RnNBDOCPX:e:d:p:S:E:cH", opts, NULL)) != -1) { switch (i) { case 'b': @@ -268,6 +272,9 @@ static void parse_command_line(int argc, char **argv) case 'B': build = 1; break; + case 'O': + optimize = 1; + break; case 'D': disable_dontaudit = 1; break; @@ -738,6 +745,8 @@ cleanup_disable: semanage_set_reload(sh, 0); if (build) semanage_set_rebuild(sh, 1); + if (optimize) + semanage_set_optimize(sh, 1); if (disable_dontaudit) semanage_set_disable_dontaudit(sh, 1); else if (build)