From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91502C43382 for ; Tue, 25 Sep 2018 00:19:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FB172098A for ; Tue, 25 Sep 2018 00:19:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Qm3PiI0i" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3FB172098A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728918AbeIYGXr (ORCPT ); Tue, 25 Sep 2018 02:23:47 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:39633 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728895AbeIYGXp (ORCPT ); Tue, 25 Sep 2018 02:23:45 -0400 Received: by mail-pf1-f195.google.com with SMTP id j8-v6so9916796pff.6 for ; Mon, 24 Sep 2018 17:18:59 -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=FSgldt3bPHeF5iFdvu16EuWQiqi5PthEyk829crGPAE=; b=Qm3PiI0i/KOlH8XTHdlAltE6Dume1a//MCmxmyktr55LnxqVFXPvoHg1vr7LDR1vAC rignWwTdniVYmTUOOqgUsC5EKEKq62QzBD4ADvRDK2nj54evH8LeFHNrm8wZ4Kb1K/iT d2JPmCit2ACMlPeIAIXmDigtIfhdqkGFfPBnc= 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=FSgldt3bPHeF5iFdvu16EuWQiqi5PthEyk829crGPAE=; b=YFCCXSoXfbQG9z0xFiZ8q5HELvlW/C4yF7/ga/oHy2Q8Gss9Orv8TSnNZhItBtDliF mCGV5/pV5IZw8Na5m8cOrWneWKQkTJFWuj9n7XCh8IAj7Y7pFH965KtjTNJx1qVheSFO Uy/dTCVHb40qNnviNzdHbCKrmHBhtMDH0By2ZEqlXMTFnAoKnDomgp5VaRypT1yq1vmk MW2LPHwaEGTZLHy8U53DPIgWNZQ4z6Hcpkr/WNsAYuDuXDb8E/NX9TGNmZnloXEeNtR/ huTI0U6uDrPQNfCRfMOMIwhsNZq7jvlbsT1wA9etVBU8tIqkmSDHV2BEBmqhXr38ji/e Hqvg== X-Gm-Message-State: ABuFfojefMVOCQtqhv5Lxlqmhz+YB+VF8qtT4sFxpf9NyosuKtHAMVwh kPntFOoY/1JLQfWgRYc55So5bg== X-Google-Smtp-Source: ACcGV61c14UKfKbzpEIBsQVKW3LwKSWYCDC7uG4VRfY0+u6lXN6scvnXZFQJFxGLq27t88JL3X5VSQ== X-Received: by 2002:a17:902:c85:: with SMTP id 5-v6mr948803plt.141.1537834739008; Mon, 24 Sep 2018 17:18:59 -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 u184-v6sm676442pgd.27.2018.09.24.17.18.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Sep 2018 17:18:50 -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 v3 21/29] LSM: Build ordered list of ordered LSMs for init Date: Mon, 24 Sep 2018 17:18:24 -0700 Message-Id: <20180925001832.18322-22-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925001832.18322-1-keescook@chromium.org> References: <20180925001832.18322-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This constructs a list of ordered LSMs to initialize, using a hard-coded list of only "integrity": minor LSMs continue to have direct hook calls, and major LSMs continue to initialize separately. Signed-off-by: Kees Cook --- security/security.c | 59 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/security/security.c b/security/security.c index a98549b334af..ef1ced0a3a50 100644 --- a/security/security.c +++ b/security/security.c @@ -34,6 +34,9 @@ #define MAX_LSM_EVM_XATTR 2 +/* How many LSMs were built into the kernel? */ +#define LSM_COUNT (__end_lsm_info - __start_lsm_info) + struct security_hook_heads security_hook_heads __lsm_ro_after_init; static ATOMIC_NOTIFIER_HEAD(lsm_notifier_chain); @@ -45,6 +48,9 @@ static __initdata const char *chosen_major_lsm; static __initconst const char * const builtin_lsm_enable = CONFIG_LSM_ENABLE; +/* Ordered list of LSMs to initialize. */ +static __initdata struct lsm_info **ordered_lsms; + static bool debug __initdata; #define init_debug(...) \ do { \ @@ -96,6 +102,45 @@ static void __init set_enabled(struct lsm_info *lsm, bool enabled) } } +/* Is an LSM already listed in the ordered LSMs list? */ +static bool __init exists_ordered_lsm(struct lsm_info *lsm) +{ + struct lsm_info **check; + + for (check = ordered_lsms; *check; check++) + if (*check == lsm) + return true; + + return false; +} + +/* Append an LSM to the list of ordered LSMs to initialize. */ +static int last_lsm __initdata; +static void __init append_ordered_lsm(struct lsm_info *lsm, const char *from) +{ + /* Ignore duplicate selections. */ + if (exists_ordered_lsm(lsm)) + return; + + if (WARN(last_lsm == LSM_COUNT, "%s: out of LSM slots!?\n", from)) + return; + + ordered_lsms[last_lsm++] = lsm; + init_debug("%s ordering: %s (%sabled)\n", from, lsm->name, + is_enabled(lsm) ? "en" : "dis"); +} + +/* Populate ordered LSMs list from hard-coded list of LSMs. */ +static void __init prepare_lsm_order(void) +{ + struct lsm_info *lsm; + + for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) { + if (strcmp(lsm->name, "integrity") == 0) + append_ordered_lsm(lsm, "builtin"); + } +} + /* Is an LSM allowed to be initialized? */ static bool __init lsm_allowed(struct lsm_info *lsm) { @@ -126,14 +171,10 @@ static void __init maybe_initialize_lsm(struct lsm_info *lsm) static void __init ordered_lsm_init(void) { - struct lsm_info *lsm; - - for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) { - if ((lsm->flags & LSM_FLAG_LEGACY_MAJOR) != 0) - continue; + struct lsm_info **lsm; - maybe_initialize_lsm(lsm); - } + for (lsm = ordered_lsms; *lsm; lsm++) + maybe_initialize_lsm(*lsm); } static void __init major_lsm_init(void) @@ -215,6 +256,8 @@ int __init security_init(void) for (i = 0; i < sizeof(security_hook_heads) / sizeof(struct hlist_head); i++) INIT_HLIST_HEAD(&list[i]); + ordered_lsms = kcalloc(LSM_COUNT + 1, sizeof(*ordered_lsms), + GFP_KERNEL); /* Figure out which LSMs are enabled and disabled. */ prepare_lsm_enable(); @@ -227,6 +270,7 @@ int __init security_init(void) loadpin_add_hooks(); /* Load LSMs in specified order. */ + prepare_lsm_order(); ordered_lsm_init(); /* @@ -234,6 +278,7 @@ int __init security_init(void) */ major_lsm_init(); + kfree(ordered_lsms); return 0; } -- 2.17.1