From patchwork Wed Sep 27 15:08:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuo Handa X-Patchwork-Id: 13400984 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 076781170F for ; Wed, 27 Sep 2023 15:09:20 +0000 (UTC) Received: from www262.sakura.ne.jp (www262.sakura.ne.jp [202.181.97.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5415FC; Wed, 27 Sep 2023 08:09:14 -0700 (PDT) Received: from fsav315.sakura.ne.jp (fsav315.sakura.ne.jp [153.120.85.146]) by www262.sakura.ne.jp (8.15.2/8.15.2) with ESMTP id 38RF8psY032776; Thu, 28 Sep 2023 00:08:51 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) Received: from www262.sakura.ne.jp (202.181.97.72) by fsav315.sakura.ne.jp (F-Secure/fsigk_smtp/550/fsav315.sakura.ne.jp); Thu, 28 Sep 2023 00:08:51 +0900 (JST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/fsav315.sakura.ne.jp) Received: from [192.168.1.6] (M106072142033.v4.enabler.ne.jp [106.72.142.33]) (authenticated bits=0) by www262.sakura.ne.jp (8.15.2/8.15.2) with ESMTPSA id 38RF8oKG032773 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NO); Thu, 28 Sep 2023 00:08:50 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) Message-ID: Date: Thu, 28 Sep 2023 00:08:47 +0900 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Content-Language: en-US To: linux-security-module , Casey Schaufler , KP Singh , Paul Moore , bpf Cc: Kees Cook , Linus Torvalds From: Tetsuo Handa Subject: [RFC PATCH 1/2] LSM: Allow dynamically appendable LSM modules. X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-State: RFC Recently, the LSM community is trying to make drastic changes. Crispin Cowan has explained It is Linus' comments that spurred me to want to start this undertaking. He observes that there are many different security approaches, each with their own advocates. He doesn't want to arbitrate which of them should be "the" Linux security approach, and would rather that Linux can support any of them. That is the purpose of this project: to allow Linux to support a variety of security models, so that security developers don't have to have the "my dog's bigger than your dog" argument, and users can choose the security model that suits their needs. when the LSM project started [1]. However, Casey Schaufler is trying to make users difficult to choose the security model that suits their needs, by requiring LSM ID value which is assigned to only LSM modules that succeeded to become in-tree [2]. Therefore, I'm asking Casey and Paul Moore to change their mind to allow assigning LSM ID value to any LSM modules (so that users can choose the security model that suits their needs) [3]. I expect that LSM ID value will be assigned to any publicly available LSM modules. Otherwise, it is mostly pointless to propose this patch; there will be little LSM modules to built into vmlinux; let alone dynamically loading as LKM-based LSMs. Also, KP Singh is trying to replace the linked list with static calls in order to reduce overhead of indirect calls [4]. However, this change assumed that any LSM modules are built-in. I don't like such assumption because I still consider that LSM modules which are not built into vmlinux will be wanted by users [5]. Then, Casey told me to supply my implementation of loadable security modules [6]. Therefore, I post this patch as basic changes needed for allowing dynamically appendable LSM modules (and an example of appendable LSM modules). This patch was tested on only x86_64. Question for KP Singh would be how can we allow dynamically appendable LSM modules if current linked list is replaced with static calls with minimal-sized array... Link: https://marc.info/?l=linux-security-module&m=98706471912438&w=2 [1] Link: https://lkml.kernel.org/r/20230912205658.3432-2-casey@schaufler-ca.com [2] Link: https://lkml.kernel.org/r/6e1c25f5-b78c-8b4e-ddc3-484129c4c0ec@I-love.SAKURA.ne.jp [3] Link: https://lkml.kernel.org/r/20230918212459.1937798-1-kpsingh@kernel.org [4] Link: https://lkml.kernel.org/r/ed785c86-a1d8-caff-c629-f8a50549e05b@I-love.SAKURA.ne.jp [5] Link: https://lkml.kernel.org/r/36c7cf74-508f-1690-f86a-bb18ec686fcf@schaufler-ca.com [6] Signed-off-by: Tetsuo Handa --- include/linux/lsm_hooks.h | 2 + security/security.c | 107 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index dcb5e5b5eb13..73db3c41df26 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -105,6 +105,8 @@ extern char *lsm_names; extern void security_add_hooks(struct security_hook_list *hooks, int count, const char *lsm); +extern int register_loadable_lsm(struct security_hook_list *hooks, int count, + const char *lsm); #define LSM_FLAG_LEGACY_MAJOR BIT(0) #define LSM_FLAG_EXCLUSIVE BIT(1) diff --git a/security/security.c b/security/security.c index 23b129d482a7..6c64b7afb251 100644 --- a/security/security.c +++ b/security/security.c @@ -74,6 +74,7 @@ const char *const lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX + 1] = { }; struct security_hook_heads security_hook_heads __ro_after_init; +EXPORT_SYMBOL_GPL(security_hook_heads); static BLOCKING_NOTIFIER_HEAD(blocking_lsm_notifier_chain); static struct kmem_cache *lsm_file_cache; @@ -537,6 +538,112 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count, } } +#if defined(CONFIG_STRICT_KERNEL_RWX) +#define MAX_RO_PAGES 1024 /* Wild guess. Can be minimized by dynamic allocation. */ +static struct page *ro_pages[MAX_RO_PAGES]; /* Pages that are marked read-only. */ +static unsigned int ro_pages_len; /* Number of pages that are marked read-only. */ + +/* Check whether a page containing given address does not have _PAGE_BIT_RW bit. */ +static bool lsm_test_page_ro(void *addr) +{ + unsigned int i; + int unused; + struct page *page; + + page = (struct page *) lookup_address((unsigned long) addr, &unused); + if (!page) + return false; + if (test_bit(_PAGE_BIT_RW, &(page->flags))) + return true; + for (i = 0; i < ro_pages_len; i++) + if (page == ro_pages[i]) + return true; + if (ro_pages_len == MAX_RO_PAGES) + return false; + ro_pages[ro_pages_len++] = page; + return true; +} + +/* Find pages which do not have _PAGE_BIT_RW bit. */ +static bool check_ro_pages(struct security_hook_list *hooks, int count) +{ + int i; + struct hlist_head *list = &security_hook_heads.capable; + + if (!copy_to_kernel_nofault(list, list, sizeof(void *))) + return true; + for (i = 0; i < count; i++) { + struct hlist_head *head = hooks[i].head; + struct security_hook_list *shp; + + if (!lsm_test_page_ro(&head->first)) + return false; + hlist_for_each_entry(shp, head, list) + if (!lsm_test_page_ro(&shp->list.next) || + !lsm_test_page_ro(&shp->list.pprev)) + return false; + } + return true; +} +#endif + +/** + * register_loadable_lsm - Add a dynamically appendable module's hooks to the hook lists. + * @hooks: the hooks to add + * @count: the number of hooks to add + * @lsm: the name of the security module + * + * Each dynamically appendable LSM has to register its hooks with the infrastructure. + * + * Assumes that this function is called from module_init() function where + * call to this function is already serialized by module_mutex lock. + */ +int register_loadable_lsm(struct security_hook_list *hooks, int count, + const char *lsm) +{ + int i; + char *cp; + + // TODO: Check whether proposed hooks can co-exist with already chained hooks, + // and bail out here if one of hooks cannot co-exist... + +#if defined(CONFIG_STRICT_KERNEL_RWX) + // Find pages which needs to make temporarily writable. + ro_pages_len = 0; + if (!check_ro_pages(hooks, count)) { + pr_err("Can't make security_hook_heads again writable. Retry with rodata=off kernel command line option added.\n"); + return -EINVAL; + } + pr_info("ro_pages_len=%d\n", ro_pages_len); +#endif + // At least "capability" is already included. + cp = kasprintf(GFP_KERNEL, "%s,%s", lsm_names, lsm); + if (!cp) { + pr_err("%s - Cannot get memory.\n", __func__); + return -ENOMEM; + } +#if defined(CONFIG_STRICT_KERNEL_RWX) + // Make security_hook_heads (and hooks chained) temporarily writable. + for (i = 0; i < ro_pages_len; i++) + set_bit(_PAGE_BIT_RW, &(ro_pages[i]->flags)); +#endif + // Register dynamically appendable module's hooks. + for (i = 0; i < count; i++) { + hooks[i].lsm = lsm; + hlist_add_tail_rcu(&hooks[i].list, hooks[i].head); + } +#if defined(CONFIG_STRICT_KERNEL_RWX) + // Make security_hook_heads (and hooks chained) again read-only. + for (i = 0; i < ro_pages_len; i++) + clear_bit(_PAGE_BIT_RW, &(ro_pages[i]->flags)); +#endif + // TODO: Wait for reader side before kfree(). + kfree(lsm_names); + lsm_names = cp; + return 0; +} +EXPORT_SYMBOL_GPL(register_loadable_lsm); + int call_blocking_lsm_notifier(enum lsm_event event, void *data) { return blocking_notifier_call_chain(&blocking_lsm_notifier_chain, From patchwork Wed Sep 27 15:09:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuo Handa X-Patchwork-Id: 13400985 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB1F31170F for ; Wed, 27 Sep 2023 15:09:52 +0000 (UTC) Received: from www262.sakura.ne.jp (www262.sakura.ne.jp [202.181.97.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1DF2F4; Wed, 27 Sep 2023 08:09:49 -0700 (PDT) Received: from fsav411.sakura.ne.jp (fsav411.sakura.ne.jp [133.242.250.110]) by www262.sakura.ne.jp (8.15.2/8.15.2) with ESMTP id 38RF9ZRE033048; Thu, 28 Sep 2023 00:09:36 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) Received: from www262.sakura.ne.jp (202.181.97.72) by fsav411.sakura.ne.jp (F-Secure/fsigk_smtp/550/fsav411.sakura.ne.jp); Thu, 28 Sep 2023 00:09:35 +0900 (JST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/fsav411.sakura.ne.jp) Received: from [192.168.1.6] (M106072142033.v4.enabler.ne.jp [106.72.142.33]) (authenticated bits=0) by www262.sakura.ne.jp (8.15.2/8.15.2) with ESMTPSA id 38RF9Z8a033045 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NO); Thu, 28 Sep 2023 00:09:35 +0900 (JST) (envelope-from penguin-kernel@I-love.SAKURA.ne.jp) Message-ID: <9fccf6d7-4b1b-dd4e-5479-3c6d21d08d5a@I-love.SAKURA.ne.jp> Date: Thu, 28 Sep 2023 00:09:31 +0900 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: [RFC PATCH 2/2] LSM: A sample of dynamically appendable LSM module. Content-Language: en-US From: Tetsuo Handa To: linux-security-module , Casey Schaufler , KP Singh , Paul Moore , bpf Cc: Kees Cook , Linus Torvalds References: In-Reply-To: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-State: RFC This is an example of dynamically appendable LSM modules. Signed-off-by: Tetsuo Handa --- demo/Makefile | 1 + demo/demo.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 demo/Makefile create mode 100644 demo/demo.c diff --git a/demo/Makefile b/demo/Makefile new file mode 100644 index 000000000000..8a6ab0945858 --- /dev/null +++ b/demo/Makefile @@ -0,0 +1 @@ +obj-m += demo.o diff --git a/demo/demo.c b/demo/demo.c new file mode 100644 index 000000000000..90b03d10bd72 --- /dev/null +++ b/demo/demo.c @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +#include +#include + +static int demo_task_alloc_security(struct task_struct *p, + unsigned long clone_flags) +{ + static unsigned int count; + + if (count++ < 5) + dump_stack(); + return 0; +} + +static void demo_task_free_security(struct task_struct *p) +{ + static unsigned int count; + + if (count++ < 5) + dump_stack(); +} + +static struct security_hook_list demo_hooks[] __ro_after_init = { + LSM_HOOK_INIT(task_free, demo_task_free_security), + LSM_HOOK_INIT(task_alloc, demo_task_alloc_security), +}; + +static int __init demo_init(void) +{ + const int ret = register_loadable_lsm(demo_hooks, + ARRAY_SIZE(demo_hooks), "demo"); + + pr_info("Registering demo LSM module returned %d.\n", ret); + return ret; +} + +module_init(demo_init); +MODULE_LICENSE("GPL");