From patchwork Thu Sep 20 16:23:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10608059 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 359696CB for ; Thu, 20 Sep 2018 16:24:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 255252E152 for ; Thu, 20 Sep 2018 16:24:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 190BB2E164; Thu, 20 Sep 2018 16:24:05 +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.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 9864D2E100 for ; Thu, 20 Sep 2018 16:24:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727252AbeITWIR (ORCPT ); Thu, 20 Sep 2018 18:08:17 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:46060 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388032AbeITWIR (ORCPT ); Thu, 20 Sep 2018 18:08:17 -0400 Received: by mail-pf1-f194.google.com with SMTP id i26-v6so4600993pfo.12 for ; Thu, 20 Sep 2018 09:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dj661ofWrIevUkOjpEMxgFKe/xflRUudjm72RcAWxpw=; b=Xzr75PuyPMjChpDxxAd5r9+6AhusmkdlEV7ZXnkFp2FPl71FEA54aVfPu+dM0YsmIm H6NdFLUQLe52sx2DUbIErzIspSGfK7goeUapLNpocp32yG/9QttxEMIaLS5ZyNRMOIMq JNpwTsplJpOu7B1JqZoAohZ1ajUhXKjse6UTg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dj661ofWrIevUkOjpEMxgFKe/xflRUudjm72RcAWxpw=; b=o7mzsxxIw5+FKLamUmRxiaJajCXSixJqKKojICSOTX0G4z9qJkpuwtTJimlcdShziR BWwCHs3l5xfLeNrdEH9KP9ILzmKcv5JYxmVVT8S8+98QY8KFeHML9rf/lOOpP582EhBd fgzwdklJ/Rn5eS/yBLBJzKupswS3Snqr3y8tVBuuoWkz4ARI1AgF8egzNdo6HgQGyOIi TeF/AeTetWnjCJmeB++T6OkRGlGDOmqSg3J/Jq5G1GEK3i9zt6rRmOrUKpHLZELbAhcU 03RkWsyUO24HXN/R/3RHRneSegrx8AICqkfNIkEI0iM/6kGa7zI+pbgt0YwYILgoT+bx 7Eow== X-Gm-Message-State: APzg51A5x/U8Y0g4iWqbRu5FbFDjKbsSielBARkGtrXYWx7a0rF0owaQ pwlqHFnKH1holcUBZTXXxwSjuw== X-Google-Smtp-Source: ANB0VdbJcBJwMpwmb9zXr7Z7Qd6q4z6PAesnSk3HeYG6TpgInkqve2K79penv0deet2X1EVWY44wJA== X-Received: by 2002:a62:f909:: with SMTP id o9-v6mr41908083pfh.141.1537460641405; Thu, 20 Sep 2018 09:24:01 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id v8-v6sm30976479pff.120.2018.09.20.09.23.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Sep 2018 09:23:55 -0700 (PDT) From: Kees Cook To: James Morris Cc: Kees Cook , Casey Schaufler , John Johansen , Tetsuo Handa , Paul Moore , Stephen Smalley , "Schaufler, Casey" , LSM , Jonathan Corbet , linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v2 20/26] LSM: Introduce "lsm.order=" for boottime ordering Date: Thu, 20 Sep 2018 09:23:32 -0700 Message-Id: <20180920162338.21060-21-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180920162338.21060-1-keescook@chromium.org> References: <20180920162338.21060-1-keescook@chromium.org> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Provide a way to reorder LSM initialization using the new "lsm.order=" comma-separated list of LSMs. Any LSMs not listed will be added in builtin order. Signed-off-by: Kees Cook --- Documentation/admin-guide/kernel-parameters.txt | 5 +++++ security/security.c | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 32d323ee9218..5ac4c1056ffa 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2276,6 +2276,11 @@ lsm.debug [SECURITY] Enable LSM initialization debugging output. + lsm.order=lsm1,...,lsmN + [SECURITY] Choose order of LSM initialization. Any + builtin LSMs not listed here will be implicitly + added to the list in builtin order. + machvec= [IA-64] Force the use of a particular machine-vector (machvec) in a generic kernel. Example: machvec=hpzx1_swiotlb diff --git a/security/security.c b/security/security.c index 063ee2466e58..4db194f81419 100644 --- a/security/security.c +++ b/security/security.c @@ -43,6 +43,7 @@ static ATOMIC_NOTIFIER_HEAD(lsm_notifier_chain); char *lsm_names; /* Boot-time LSM user choice */ static __initdata const char *chosen_major_lsm; +static __initdata const char *chosen_lsm_order; static __initconst const char * const builtin_lsm_order = CONFIG_LSM_ORDER; @@ -136,11 +137,15 @@ static void __init parse_lsm_order(const char *order, const char *origin) kfree(sep); } -/* Populate ordered LSMs list from builtin list of LSMs. */ +/* Populate ordered LSMs list from commandline and builtin list of LSMs. */ static void __init prepare_lsm_order(void) { struct lsm_info *lsm; + /* Parse order from commandline, if present. */ + if (chosen_lsm_order) + parse_lsm_order(chosen_lsm_order, "cmdline"); + /* Parse order from builtin list. */ parse_lsm_order(builtin_lsm_order, "builtin"); @@ -264,6 +269,14 @@ static int __init choose_major_lsm(char *str) } __setup("security=", choose_major_lsm); +/* Explicitly choose LSM initialization order. */ +static int __init choose_lsm_order(char *str) +{ + chosen_lsm_order = str; + return 1; +} +__setup("lsm.order=", choose_lsm_order); + /* Enable LSM order debugging. */ static int __init enable_debug(char *str) {