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=-16.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL 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 B2222C43613 for ; Fri, 21 Jun 2019 01:19:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D6A62084A for ; Fri, 21 Jun 2019 01:19:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="NhLRSV0c" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726285AbfFUBTx (ORCPT ); Thu, 20 Jun 2019 21:19:53 -0400 Received: from mail-vs1-f74.google.com ([209.85.217.74]:49447 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726106AbfFUBTu (ORCPT ); Thu, 20 Jun 2019 21:19:50 -0400 Received: by mail-vs1-f74.google.com with SMTP id 184so1577832vsw.16 for ; Thu, 20 Jun 2019 18:19:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=GiJpTtHykOV34Seb4Mc0AwsRDDy6yI+hUgRCcqphZd8=; b=NhLRSV0cDvDhBBn+5r5hSYjih0xwRMAyuuKctGXTUqEMonVO+/inTuHX5zZaaUcHaH OkhPbSK5yG5eokM2R7vaFg/L3HhfJWK5/j0WqMJiTPEwgm4JIIy5sNFvj3DBA5WluLhM AyuDywB94kw0+h7YdRR7b2SVO/sDHuLB4c+ousEltoeZcLt26cmwvJoo1hdvBQZmLAoH ejLQgNvznUGXNTK/a+tRLIJPgmgVuXwmyDMA7Usy5R55hG4ZvCcS8Hrj8Bi9NOeBRnDl BYnLKi5ztw1U0X0rPfWcYXEIh4WcoBDf/x89dU57p1ZoARgq0nzBGrWz3R4eQLNlJOP/ oyLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=GiJpTtHykOV34Seb4Mc0AwsRDDy6yI+hUgRCcqphZd8=; b=b0h0QbwiCaKMBGSRnZPJ4b6beE7MKpQviB/uRdRq+hVH3Pw90IHMEW7E0VlaDfLORY AHQgkUS+yGucNpQrpl+aAUH0moPeHP/7jUTRK61dkIPV+s7bAncOQVEJcYSQ1eTXpiH0 eZsI3Jg5VlhxFP7WPDBG2pTS3IGHLuxmY7w2LS31ZJULp2RtPQWYCvUdUIeP7q5wcLNe 5SyWK6B/Cwv+8Lhui2DGt2OcvtC/0v/IXI4rXnZtHTiRwkAU9saTyWRtZAUG9C0YQBf7 bEo4oUftUXPMvctGDjnhrbNOYzxL+NdmgwitJdf0r9cBWWHiR9VqMz1tR24meMsQrGKM l0tA== X-Gm-Message-State: APjAAAXdggjixeSOSVNnfRpmSh/eEksug1WQAAJ+nI/2d6/EFK1Siumd a+mXDf+ewaTn06xG1Afl9MOONJWnbnEtnTmjLlbVXQ== X-Google-Smtp-Source: APXvYqxz0UO3SsNY7xvMTegFLzs7443HdhwYsjPHVDrSJkChCQWnaRjPAfTqyhKjZ7OTlmL1UEe8U052b3tNZ3uXm5t0tA== X-Received: by 2002:a67:ea58:: with SMTP id r24mr16081248vso.60.1561079989231; Thu, 20 Jun 2019 18:19:49 -0700 (PDT) Date: Thu, 20 Jun 2019 18:19:12 -0700 In-Reply-To: <20190621011941.186255-1-matthewgarrett@google.com> Message-Id: <20190621011941.186255-2-matthewgarrett@google.com> Mime-Version: 1.0 References: <20190621011941.186255-1-matthewgarrett@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH V33 01/30] security: Support early LSMs From: Matthew Garrett To: jmorris@namei.org Cc: linux-security@vger.kernel.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, Matthew Garrett , Matthew Garrett Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The lockdown module is intended to allow for kernels to be locked down early in boot - sufficiently early that we don't have the ability to kmalloc() yet. Add support for early initialisation of some LSMs, and then add them to the list of names when we do full initialisation later. Signed-off-by: Matthew Garrett --- include/asm-generic/vmlinux.lds.h | 8 +++++- include/linux/lsm_hooks.h | 6 ++++ include/linux/security.h | 1 + init/main.c | 1 + security/security.c | 48 +++++++++++++++++++++++++------ 5 files changed, 54 insertions(+), 10 deletions(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index f8f6f04c4453..e1963352fdb6 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -208,8 +208,13 @@ __start_lsm_info = .; \ KEEP(*(.lsm_info.init)) \ __end_lsm_info = .; +#define EARLY_LSM_TABLE() . = ALIGN(8); \ + __start_early_lsm_info = .; \ + KEEP(*(.early_lsm_info.init)) \ + __end_early_lsm_info = .; #else #define LSM_TABLE() +#define EARLY_LSM_TABLE() #endif #define ___OF_TABLE(cfg, name) _OF_TABLE_##cfg(name) @@ -610,7 +615,8 @@ ACPI_PROBE_TABLE(irqchip) \ ACPI_PROBE_TABLE(timer) \ EARLYCON_TABLE() \ - LSM_TABLE() + LSM_TABLE() \ + EARLY_LSM_TABLE() #define INIT_TEXT \ *(.init.text .init.text.*) \ diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index a240a3fc5fc4..66fd1eac7a32 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2085,12 +2085,18 @@ struct lsm_info { }; extern struct lsm_info __start_lsm_info[], __end_lsm_info[]; +extern struct lsm_info __start_early_lsm_info[], __end_early_lsm_info[]; #define DEFINE_LSM(lsm) \ static struct lsm_info __lsm_##lsm \ __used __section(.lsm_info.init) \ __aligned(sizeof(unsigned long)) +#define DEFINE_EARLY_LSM(lsm) \ + static struct lsm_info __early_lsm_##lsm \ + __used __section(.early_lsm_info.init) \ + __aligned(sizeof(unsigned long)) + #ifdef CONFIG_SECURITY_SELINUX_DISABLE /* * Assuring the safety of deleting a security module is up to diff --git a/include/linux/security.h b/include/linux/security.h index 49f2685324b0..1bb6fb2f1523 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -194,6 +194,7 @@ int unregister_lsm_notifier(struct notifier_block *nb); /* prototypes */ extern int security_init(void); +extern int early_security_init(void); /* Security operations */ int security_binder_set_context_mgr(struct task_struct *mgr); diff --git a/init/main.c b/init/main.c index 598e278b46f7..f3faeb89c75f 100644 --- a/init/main.c +++ b/init/main.c @@ -563,6 +563,7 @@ asmlinkage __visible void __init start_kernel(void) boot_cpu_init(); page_address_init(); pr_notice("%s", linux_banner); + early_security_init(); setup_arch(&command_line); /* * Set up the the initial canary and entropy after arch diff --git a/security/security.c b/security/security.c index 23cbb1a295a3..2a6672c9e72f 100644 --- a/security/security.c +++ b/security/security.c @@ -37,6 +37,7 @@ /* How many LSMs were built into the kernel? */ #define LSM_COUNT (__end_lsm_info - __start_lsm_info) +#define EARLY_LSM_COUNT (__end_early_lsm_info - __start_early_lsm_info) struct security_hook_heads security_hook_heads __lsm_ro_after_init; static ATOMIC_NOTIFIER_HEAD(lsm_notifier_chain); @@ -281,6 +282,8 @@ static void __init ordered_lsm_parse(const char *order, const char *origin) static void __init lsm_early_cred(struct cred *cred); static void __init lsm_early_task(struct task_struct *task); +static int lsm_append(const char *new, char **result); + static void __init ordered_lsm_init(void) { struct lsm_info **lsm; @@ -327,15 +330,11 @@ static void __init ordered_lsm_init(void) kfree(ordered_lsms); } -/** - * security_init - initializes the security framework - * - * This should be called early in the kernel initialization sequence. - */ -int __init security_init(void) +int __init early_security_init(void) { int i; struct hlist_head *list = (struct hlist_head *) &security_hook_heads; + struct lsm_info *lsm; pr_info("Security Framework initializing\n"); @@ -343,6 +342,30 @@ int __init security_init(void) i++) INIT_HLIST_HEAD(&list[i]); + for (lsm = __start_early_lsm_info; lsm < __end_early_lsm_info; lsm++) { + if (!lsm->enabled) + lsm->enabled = &lsm_enabled_true; + initialize_lsm(lsm); + } + + return 0; +} + +/** + * security_init - initializes the security framework + * + * This should be called early in the kernel initialization sequence. + */ +int __init security_init(void) +{ + struct lsm_info *lsm; + + /* Append the names of the early LSM modules now */ + for (lsm = __start_early_lsm_info; lsm < __end_early_lsm_info; lsm++) { + if (lsm->enabled) + lsm_append(lsm->name, &lsm_names); + } + /* Load LSMs in specified order. */ ordered_lsm_init(); @@ -388,7 +411,7 @@ static bool match_last_lsm(const char *list, const char *lsm) return !strcmp(last, lsm); } -static int lsm_append(char *new, char **result) +static int lsm_append(const char *new, char **result) { char *cp; @@ -426,8 +449,15 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count, hooks[i].lsm = lsm; hlist_add_tail_rcu(&hooks[i].list, hooks[i].head); } - if (lsm_append(lsm, &lsm_names) < 0) - panic("%s - Cannot get early memory.\n", __func__); + + /* + * Don't try to append during early_security_init(), we'll come back + * and fix this up afterwards. + */ + if (slab_is_available()) { + if (lsm_append(lsm, &lsm_names) < 0) + panic("%s - Cannot get early memory.\n", __func__); + } } int call_lsm_notifier(enum lsm_event event, void *data) -- 2.22.0.410.gd8fdbe21b5-goog