From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9446BC433FE for ; Mon, 7 Mar 2022 17:45:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244482AbiCGRqT (ORCPT ); Mon, 7 Mar 2022 12:46:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239532AbiCGRqL (ORCPT ); Mon, 7 Mar 2022 12:46:11 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1272171ED9 for ; Mon, 7 Mar 2022 09:45:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4EEwWZZAjwW/ysDjBUtGda9incLc4VBnaTI9ZWPATn8=; b=Ns3Rk9RH19487SDuAmFmNcSaum7oDMQVZU52oc9+WBbVlPlrvyQvFMT/RHUXc4y61Z0DgR o1LxlhtvBse68InB0KmePf0hW8Oret5IJRHt1SgHqCNlSDgYmPFAC254znNSsft5ALoSgw iosNHUWgWPy/ns6sSb/MgZf3kh/zzdY= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-424-6X3RkUbWODeEtHhvBXrj8w-1; Mon, 07 Mar 2022 12:45:14 -0500 X-MC-Unique: 6X3RkUbWODeEtHhvBXrj8w-1 Received: by mail-wm1-f69.google.com with SMTP id h206-20020a1c21d7000000b003552c13626cso8148500wmh.3 for ; Mon, 07 Mar 2022 09:45:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4EEwWZZAjwW/ysDjBUtGda9incLc4VBnaTI9ZWPATn8=; b=IXDdpwMZ5VKyc/2agPO/J4B98fRn/KlyJgmxfzxB6BcCZhBL/ChIVIBpFH1KyXYZu1 S5g/DwytI3ob4NIn6z+9hAgjIHyWz79LxFMCrclv3Ywy0KPrWiLt24LEevkD5HgFTBGy CKJc1BzPxtYEWxQlEQKl2PEFGuiPTZDat9Freo7s9dXd5yDBoIgJ9CbSsz3LqR9czDYi APnFAvEjeWfKNxK1q5qzKqHOk8KltdUyNG8lh4o/FpUWIe5hG9vHu4vXUTNgpe3E9lwB 5lgROP5W9DEOagPZgXjwxjWpz6C493wChXYE3C02RX2FeovvWpzRaSsuCL5aWKyFfnNb M5Cw== X-Gm-Message-State: AOAM532PeqoWlCJ0syUYF3p6lIt9lxpopuPxkRBnTjsKOzVbTB1XIs2Q HQJdcAPh9PY00oEQyic8qKcCrU6UbxqY67Nrt+v3HzB1iBgg5BLiBUzzaHyhiUiZ06tO41ziezK AHB/kF+MJyjOiQ7Cz73Kqkuo= X-Received: by 2002:a05:600c:4c11:b0:383:fae4:41c2 with SMTP id d17-20020a05600c4c1100b00383fae441c2mr50935wmp.104.1646675113133; Mon, 07 Mar 2022 09:45:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0WEXCi5LjQ1WssoIWCUr2ZPif3LiBFPM5YCl/4kfh1AwtZn70fLDgYTg7zMMTFnTBR21+ZQ== X-Received: by 2002:a05:600c:4c11:b0:383:fae4:41c2 with SMTP id d17-20020a05600c4c1100b00383fae441c2mr50920wmp.104.1646675112927; Mon, 07 Mar 2022 09:45:12 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id c12-20020a05600c0a4c00b00381141f4967sm17492374wmq.35.2022.03.07.09.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:45:12 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 01/14] module: Move all into module/ Date: Mon, 7 Mar 2022 17:44:56 +0000 Message-Id: <20220307174509.2887714-2-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional changes. This patch moves all module related code into a separate directory, modifies each file name and creates a new Makefile. Note: this effort is in preparation to refactor core module code. Reviewed-by: Christophe Leroy Signed-off-by: Aaron Tomlin --- MAINTAINERS | 2 +- kernel/Makefile | 5 +---- kernel/module/Makefile | 12 ++++++++++++ kernel/{module_decompress.c =3D> module/decompress.c} | 2 +- kernel/{module-internal.h =3D> module/internal.h} | 0 kernel/{module.c =3D> module/main.c} | 2 +- kernel/{module_signing.c =3D> module/signing.c} | 2 +- 7 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 kernel/module/Makefile rename kernel/{module_decompress.c =3D> module/decompress.c} (99%) rename kernel/{module-internal.h =3D> module/internal.h} (100%) rename kernel/{module.c =3D> module/main.c} (99%) rename kernel/{module_signing.c =3D> module/signing.c} (97%) diff --git a/MAINTAINERS b/MAINTAINERS index bd86ed9fbc79..463bdb829db4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13012,7 +13012,7 @@ L: linux-kernel@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modu= les-next F: include/linux/module.h -F: kernel/module.c +F: kernel/module/ =20 MONOLITHIC POWER SYSTEM PMIC DRIVER M: Saravanan Sekar diff --git a/kernel/Makefile b/kernel/Makefile index 56f4ee97f328..717075b65deb 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -29,7 +29,6 @@ KCOV_INSTRUMENT_softirq.o :=3D n KCSAN_SANITIZE_softirq.o =3D n # These are called from save_stack_trace() on slub debug path, # and produce insane amounts of uninteresting coverage. -KCOV_INSTRUMENT_module.o :=3D n KCOV_INSTRUMENT_extable.o :=3D n KCOV_INSTRUMENT_stacktrace.o :=3D n # Don't self-instrument. @@ -53,6 +52,7 @@ obj-y +=3D rcu/ obj-y +=3D livepatch/ obj-y +=3D dma/ obj-y +=3D entry/ +obj-$(CONFIG_MODULES) +=3D module/ =20 obj-$(CONFIG_KCMP) +=3D kcmp.o obj-$(CONFIG_FREEZER) +=3D freezer.o @@ -66,9 +66,6 @@ ifneq ($(CONFIG_SMP),y) obj-y +=3D up.o endif obj-$(CONFIG_UID16) +=3D uid16.o -obj-$(CONFIG_MODULES) +=3D module.o -obj-$(CONFIG_MODULE_DECOMPRESS) +=3D module_decompress.o -obj-$(CONFIG_MODULE_SIG) +=3D module_signing.o obj-$(CONFIG_MODULE_SIG_FORMAT) +=3D module_signature.o obj-$(CONFIG_KALLSYMS) +=3D kallsyms.o obj-$(CONFIG_BSD_PROCESS_ACCT) +=3D acct.o diff --git a/kernel/module/Makefile b/kernel/module/Makefile new file mode 100644 index 000000000000..cdd5c61b8c7f --- /dev/null +++ b/kernel/module/Makefile @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Makefile for linux kernel module support +# + +# These are called from save_stack_trace() on slub debug path, +# and produce insane amounts of uninteresting coverage. +KCOV_INSTRUMENT_module.o :=3D n + +obj-y +=3D main.o +obj-$(CONFIG_MODULE_DECOMPRESS) +=3D decompress.o +obj-$(CONFIG_MODULE_SIG) +=3D signing.o diff --git a/kernel/module_decompress.c b/kernel/module/decompress.c similarity index 99% rename from kernel/module_decompress.c rename to kernel/module/decompress.c index ffef98a20320..d14d6443225a 100644 --- a/kernel/module_decompress.c +++ b/kernel/module/decompress.c @@ -12,7 +12,7 @@ #include #include =20 -#include "module-internal.h" +#include "internal.h" =20 static int module_extend_max_pages(struct load_info *info, unsigned int ex= tent) { diff --git a/kernel/module-internal.h b/kernel/module/internal.h similarity index 100% rename from kernel/module-internal.h rename to kernel/module/internal.h diff --git a/kernel/module.c b/kernel/module/main.c similarity index 99% rename from kernel/module.c rename to kernel/module/main.c index 46a5c2ed1928..34a2b0cf3c3e 100644 --- a/kernel/module.c +++ b/kernel/module/main.c @@ -58,7 +58,7 @@ #include #include #include -#include "module-internal.h" +#include "internal.h" =20 #define CREATE_TRACE_POINTS #include diff --git a/kernel/module_signing.c b/kernel/module/signing.c similarity index 97% rename from kernel/module_signing.c rename to kernel/module/signing.c index 8723ae70ea1f..8aeb6d2ee94b 100644 --- a/kernel/module_signing.c +++ b/kernel/module/signing.c @@ -12,7 +12,7 @@ #include #include #include -#include "module-internal.h" +#include "internal.h" =20 /* * Verify the signature on a module. --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BD9CC433F5 for ; Mon, 7 Mar 2022 17:45:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244485AbiCGRqY (ORCPT ); Mon, 7 Mar 2022 12:46:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240024AbiCGRqM (ORCPT ); Mon, 7 Mar 2022 12:46:12 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2E80571EE3 for ; Mon, 7 Mar 2022 09:45:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zln+MaotO9F3OZWBQkZ8RRcCDDlcbIVRMz8zB5PgPNY=; b=i1Psm0wIoaGxjcx0KJV2v/hhvhePk1TgM0KGeIJny9tW606yUcOaD8J10lGZpy6+3dq1Lv YjvkalI7oDJO0ChBRVTEiKRC8y/ka3Iv7nsB5GRpcdnvFegUW1CZyNYyG5T5C6XQur1IDi sgoE2g85Gjdypq20xRfPJ/vrr/BE2IE= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-623-8egaDb-cMgihWEjUSekSwg-1; Mon, 07 Mar 2022 12:45:16 -0500 X-MC-Unique: 8egaDb-cMgihWEjUSekSwg-1 Received: by mail-wr1-f72.google.com with SMTP id p9-20020adf9589000000b001e333885ac1so4805152wrp.10 for ; Mon, 07 Mar 2022 09:45:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zln+MaotO9F3OZWBQkZ8RRcCDDlcbIVRMz8zB5PgPNY=; b=4GT2MRWkheHTkkvFF/YRYIPrMPl+B2PRpu93qsst2FtnS9gb/9OCD1pIzgg5OwajeJ 5cNV+tSIfYLgo9Uwo42ZXIYfWDsx12Eo1HdPJPEJ9QRyNJtRieiTFhDPvGF/SBiE5fHz Ey/vF12aIHnzlV71dRPh43EIf+tosx4cdWZz8lZByjVEhLXKwn1OiyX50EYX0+S2Wb8e 01rrUy3/pRD3oCLB6XuyM8XwvATCdHz4f7Mom+DasPNcHJp9d/gHJtDhNAC61O3ycI+R YWYPHNBkw0bSC7YYbIXGhXmXILTHZVbTvH8w6m0BP9ZUIILGg73rJ+uXxoyeV6Z1xfe3 1new== X-Gm-Message-State: AOAM532Zwkcal6mFo9myVUHIZD7GLNHUsdW7ii37ePpb4AS583s1dNHp SgB0Q6CkvJ4/Krkl6bk/7OuP3DY4/cm2eaRsrrIBZJXebkCBFwBWn6g4Dx+EBc9cZcsH6/cp8D+ 7MyvIW4IeeYFzT3yPZVWt6vY= X-Received: by 2002:a1c:3b8a:0:b0:380:e40a:289 with SMTP id i132-20020a1c3b8a000000b00380e40a0289mr34308wma.17.1646675114811; Mon, 07 Mar 2022 09:45:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJyY/fkUfr3e+yHgjvOoGxvPVt/pwa4RcBCbGkd/zhkEYQLLrZJrU48t5SjlLln7AqjJ3UDMgA== X-Received: by 2002:a1c:3b8a:0:b0:380:e40a:289 with SMTP id i132-20020a1c3b8a000000b00380e40a0289mr34275wma.17.1646675114602; Mon, 07 Mar 2022 09:45:14 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id g11-20020a5d554b000000b001f0326a23ddsm12153963wrw.70.2022.03.07.09.45.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:45:14 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 02/14] module: Simple refactor in preparation for split Date: Mon, 7 Mar 2022 17:44:57 +0000 Message-Id: <20220307174509.2887714-3-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. This patch makes it possible to move non-essential code out of core module code. Reviewed-by: Christophe Leroy Signed-off-by: Aaron Tomlin --- kernel/module/internal.h | 21 +++++++++++++++++++++ kernel/module/main.c | 22 ++-------------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/kernel/module/internal.h b/kernel/module/internal.h index 8c381c99062f..ea8c4c02614c 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -7,6 +7,27 @@ =20 #include #include +#include + +#ifndef ARCH_SHF_SMALL +#define ARCH_SHF_SMALL 0 +#endif + +/* If this is set, the section belongs in the init part of the module */ +#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG - 1)) +/* Maximum number of characters written by module_flags() */ +#define MODULE_FLAGS_BUF_SIZE (TAINT_FLAGS_COUNT + 4) + +extern struct mutex module_mutex; +extern struct list_head modules; + +/* Provided by the linker */ +extern const struct kernel_symbol __start___ksymtab[]; +extern const struct kernel_symbol __stop___ksymtab[]; +extern const struct kernel_symbol __start___ksymtab_gpl[]; +extern const struct kernel_symbol __stop___ksymtab_gpl[]; +extern const s32 __start___kcrctab[]; +extern const s32 __start___kcrctab_gpl[]; =20 struct load_info { const char *name; diff --git a/kernel/module/main.c b/kernel/module/main.c index 34a2b0cf3c3e..5f5e21f972dd 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -63,10 +63,6 @@ #define CREATE_TRACE_POINTS #include =20 -#ifndef ARCH_SHF_SMALL -#define ARCH_SHF_SMALL 0 -#endif - /* * Modules' sections will be aligned on page boundaries * to ensure complete separation of code and data, but @@ -78,9 +74,6 @@ # define debug_align(X) (X) #endif =20 -/* If this is set, the section belongs in the init part of the module */ -#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1)) - /* * Mutex protects: * 1) List of modules (also safely readable with preempt_disable), @@ -88,8 +81,8 @@ * 3) module_addr_min/module_addr_max. * (delete and add uses RCU list operations). */ -static DEFINE_MUTEX(module_mutex); -static LIST_HEAD(modules); +DEFINE_MUTEX(module_mutex); +LIST_HEAD(modules); =20 /* Work queue for freeing init sections in success case */ static void do_free_init(struct work_struct *w); @@ -408,14 +401,6 @@ static __maybe_unused void *any_section_objs(const str= uct load_info *info, return (void *)info->sechdrs[sec].sh_addr; } =20 -/* Provided by the linker */ -extern const struct kernel_symbol __start___ksymtab[]; -extern const struct kernel_symbol __stop___ksymtab[]; -extern const struct kernel_symbol __start___ksymtab_gpl[]; -extern const struct kernel_symbol __stop___ksymtab_gpl[]; -extern const s32 __start___kcrctab[]; -extern const s32 __start___kcrctab_gpl[]; - #ifndef CONFIG_MODVERSIONS #define symversion(base, idx) NULL #else @@ -4542,9 +4527,6 @@ static void cfi_cleanup(struct module *mod) #endif } =20 -/* Maximum number of characters written by module_flags() */ -#define MODULE_FLAGS_BUF_SIZE (TAINT_FLAGS_COUNT + 4) - /* Keep in sync with MODULE_FLAGS_BUF_SIZE !!! */ static char *module_flags(struct module *mod, char *buf) { --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66BCCC433EF for ; Mon, 7 Mar 2022 17:45:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244497AbiCGRq3 (ORCPT ); Mon, 7 Mar 2022 12:46:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243853AbiCGRqS (ORCPT ); Mon, 7 Mar 2022 12:46:18 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A7B2C7B569 for ; Mon, 7 Mar 2022 09:45:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wTqJ9ZbJUCgx8VrF++WoBF0cwmRu2Y/rNRNUF4x8BCg=; b=jNxfdwc6KxoS8Qx+c+xDIyZLebC2rGm1SuuKstezhUe7rdG70i+xEydMU3LSwL8J9CFNNH xhKwiYy6IvbLBi42PspMeQYHKu0rn/xhl+JGOtVXu7n2o4tZEPqp81mHW8X7VwpDLIPiYm 6Mr2KqABgFnFPplscZ5JsBoDAln2RZ8= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-528-ZfjvM3v_No2v2vFHKNqiUw-1; Mon, 07 Mar 2022 12:45:18 -0500 X-MC-Unique: ZfjvM3v_No2v2vFHKNqiUw-1 Received: by mail-wr1-f69.google.com with SMTP id p9-20020adf9589000000b001e333885ac1so4805188wrp.10 for ; Mon, 07 Mar 2022 09:45:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wTqJ9ZbJUCgx8VrF++WoBF0cwmRu2Y/rNRNUF4x8BCg=; b=pSir7YwyGcnzZTzt6XwaLf7CAhpjD6W4QHSDnl71KoYz2RNNxmvuEv4ABpZ2kNk9os Z7R9Dui6mBtkr6/LFebdvAu393efoWQnVjsfHsb52Y+lIfi7aM4OmqldSqRbYGFL8OT5 k5cyjujZv2hr81fhmyFtkMW3stJ3gVd7k8XhF0Y4bmyuSK30GPpkmfnKSW/IflpLPk1+ IoeGvoVFlkhhOE1sroHAtxMEyc0jeHhNhQI2MmxbHGxd8Stpu//wtrA09gx3u+gE+YQu zxCOG54WEOZHEsCaiOrvxWa1YTPOKixUm3NhHR5iKCHjfj2+Ue2Wh/gKDSgbCimBbTJl a0wg== X-Gm-Message-State: AOAM530rVmaIL8u0eIge/WTfu+6YnaYM2y/PkMCfaWlEXCqJMX5yfjIu XVx+f0oh7hHx15LSHGGw9fpMxW38UJa6ADkJ7XtZ0qO0x7suq2AiMCjv3ZxJtZiBvL2khdYTJRY /3rq58kOzH9ZoFkFDpzZoPmM= X-Received: by 2002:a05:600c:1994:b0:389:bcf5:6e79 with SMTP id t20-20020a05600c199400b00389bcf56e79mr30158wmq.43.1646675117029; Mon, 07 Mar 2022 09:45:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSlHfCNIFSMY6GvPD2hVj1xnBcjeTCxoOc/O12pWsyWj9bAUgSgODkL1aJlXzDdE4LyoIC+w== X-Received: by 2002:a05:600c:1994:b0:389:bcf5:6e79 with SMTP id t20-20020a05600c199400b00389bcf56e79mr30127wmq.43.1646675116770; Mon, 07 Mar 2022 09:45:16 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id v25-20020a05600c215900b0038117f41728sm19970307wml.43.2022.03.07.09.45.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:45:15 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 03/14] module: Make internal.h and decompress.c more compliant Date: Mon, 7 Mar 2022 17:44:58 +0000 Message-Id: <20220307174509.2887714-4-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch will address the following warning and style violations generated by ./scripts/checkpatch.pl in strict mode: WARNING: Use #include instead of #10: FILE: kernel/module/internal.h:10: +#include CHECK: spaces preferred around that '-' (ctx:VxV) #18: FILE: kernel/module/internal.h:18: +#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1)) CHECK: Please use a blank line after function/struct/union/enum declarati= ons #69: FILE: kernel/module/internal.h:69: +} +static inline void module_decompress_cleanup(struct load_info *info) ^ CHECK: extern prototypes should be avoided in .h files #84: FILE: kernel/module/internal.h:84: +extern int mod_verify_sig(const void *mod, struct load_info *info); WARNING: Missing a blank line after declarations #116: FILE: kernel/module/decompress.c:116: + struct page *page =3D module_get_next_page(info); + if (!page) { WARNING: Missing a blank line after declarations #174: FILE: kernel/module/decompress.c:174: + struct page *page =3D module_get_next_page(info); + if (!page) { CHECK: Please use a blank line after function/struct/union/enum declarati= ons #258: FILE: kernel/module/decompress.c:258: +} +static struct kobj_attribute module_compression_attr =3D __ATTR_RO(compr= ession); Note: Fortunately, the multiple-include optimisation found in include/linux/module.h will prevent duplication/or inclusion more than once. Fixes: f314dfea16a ("modsign: log module name in the event of an error") Reviewed-by: Christophe Leroy Signed-off-by: Aaron Tomlin --- kernel/module/decompress.c | 3 +++ kernel/module/internal.h | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kernel/module/decompress.c b/kernel/module/decompress.c index d14d6443225a..2fc7081dd7c1 100644 --- a/kernel/module/decompress.c +++ b/kernel/module/decompress.c @@ -113,6 +113,7 @@ static ssize_t module_gzip_decompress(struct load_info = *info, =20 do { struct page *page =3D module_get_next_page(info); + if (!page) { retval =3D -ENOMEM; goto out_inflate_end; @@ -171,6 +172,7 @@ static ssize_t module_xz_decompress(struct load_info *i= nfo, =20 do { struct page *page =3D module_get_next_page(info); + if (!page) { retval =3D -ENOMEM; goto out; @@ -256,6 +258,7 @@ static ssize_t compression_show(struct kobject *kobj, { return sysfs_emit(buf, "%s\n", __stringify(MODULE_COMPRESSION)); } + static struct kobj_attribute module_compression_attr =3D __ATTR_RO(compres= sion); =20 static int __init module_decompress_sysfs_init(void) diff --git a/kernel/module/internal.h b/kernel/module/internal.h index ea8c4c02614c..e0775e66bcf7 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -6,7 +6,8 @@ */ =20 #include -#include +#include +#include #include =20 #ifndef ARCH_SHF_SMALL @@ -54,7 +55,7 @@ struct load_info { } index; }; =20 -extern int mod_verify_sig(const void *mod, struct load_info *info); +int mod_verify_sig(const void *mod, struct load_info *info); =20 #ifdef CONFIG_MODULE_DECOMPRESS int module_decompress(struct load_info *info, const void *buf, size_t size= ); @@ -65,6 +66,7 @@ static inline int module_decompress(struct load_info *inf= o, { return -EOPNOTSUPP; } + static inline void module_decompress_cleanup(struct load_info *info) { } --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26794C433EF for ; Mon, 7 Mar 2022 17:45:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237383AbiCGRq1 (ORCPT ); Mon, 7 Mar 2022 12:46:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242230AbiCGRqS (ORCPT ); Mon, 7 Mar 2022 12:46:18 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 13BA37EB1B for ; Mon, 7 Mar 2022 09:45:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0XjJucHH84WkOaA2Fzv90/VbRq4leBo+7myOeJDewzQ=; b=KdCeAw6mSRY70VFd+JCOAIIs4AWVDrz9inY9uXXIvaKfqZJ/uYdxcnsH5Cr9NgbIBju2aK Sux1HCQ48HvRXItwMTJSnSQ7Ry+Zvxqh4aZfPYGnqAYsiQjqMTGV+jMuaATgSOkeTQAvGB HQv7LkAFMwjBB0EiUlxgDov91LArKwk= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-592-ubpOLgpaPPye-lWXdN5luA-1; Mon, 07 Mar 2022 12:45:21 -0500 X-MC-Unique: ubpOLgpaPPye-lWXdN5luA-1 Received: by mail-wm1-f71.google.com with SMTP id 20-20020a05600c231400b00389886f6b23so4875600wmo.6 for ; Mon, 07 Mar 2022 09:45:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0XjJucHH84WkOaA2Fzv90/VbRq4leBo+7myOeJDewzQ=; b=SD5KFxaeRYyZUgnzrx9DyUSYzpRruT3Rro017hZAMZHi4+jQaUr9bs5IkpPZZ6i4Y3 MkzC45mveIQT0Wc8OF14M7z6aEnlyUKqrpUkIDRuKIaQ/PSfeB0BvitsJYBjeRhV2vYf AKjlOKmy3vUElF8sqtei/Vkyj8Sd8uut3NjMpTOfoz2w2JTNjxFAMhxr8NbkkarvOfUl okjQB9Qu70KtDOdvMzWTSWX96DALfL852f/hZKWVRyKqg+aQGI1gxtAJ88nB//KBJ4Ff s9NpU1jqHj1N7NimOvJah7+YzTK3bFaENjvTt6TRbnJMsI6TyrDek6hSXM5suD0xJ5ti c3qw== X-Gm-Message-State: AOAM531oxaOdnYENXoCI1A9bozG1Lx+jKdi/FFuQ8q9ox9fqdu1pvkqw v3fiwpuob25+PZWn1RZpvesaqN+JmgnaXynBaOKPERzUrjxuVD1lV+CnWxXwsZjjM4gS/AYHTfB r6f+FyY4y3g5qq7xureamMV4= X-Received: by 2002:a05:6000:11d0:b0:1f1:f6ea:f9a with SMTP id i16-20020a05600011d000b001f1f6ea0f9amr5196193wrx.40.1646675119709; Mon, 07 Mar 2022 09:45:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJwAXby8Ejd6GuGPpLaeL12324mffUP6U7/W6QUSgviQrMXoLdNFKpOQVw/N5s31IEM94QsrbA== X-Received: by 2002:a05:6000:11d0:b0:1f1:f6ea:f9a with SMTP id i16-20020a05600011d000b001f1f6ea0f9amr5196170wrx.40.1646675119443; Mon, 07 Mar 2022 09:45:19 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id l13-20020a5d4bcd000000b001f0620ecb3csm10779760wrt.40.2022.03.07.09.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:45:18 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 04/14] module: Move livepatch support to a separate file Date: Mon, 7 Mar 2022 17:44:59 +0000 Message-Id: <20220307174509.2887714-5-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. This patch migrates livepatch support (i.e. used during module add/or load and remove/or deletion) from core module code into kernel/module/livepatch.c. At the moment it contains code to persist Elf information about a given livepatch module, only. The new file was added to MAINTAINERS. Reviewed-by: Petr Mladek Tested-by: Petr Mladek Signed-off-by: Aaron Tomlin --- MAINTAINERS | 1 + include/linux/module.h | 9 ++-- kernel/module/Makefile | 1 + kernel/module/internal.h | 22 ++++++++ kernel/module/livepatch.c | 74 +++++++++++++++++++++++++++ kernel/module/main.c | 102 ++++---------------------------------- 6 files changed, 111 insertions(+), 98 deletions(-) create mode 100644 kernel/module/livepatch.c diff --git a/MAINTAINERS b/MAINTAINERS index 463bdb829db4..195cf1ac2ee8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11149,6 +11149,7 @@ F: arch/s390/include/asm/livepatch.h F: arch/x86/include/asm/livepatch.h F: include/linux/livepatch.h F: kernel/livepatch/ +F: kernel/module/livepatch.c F: lib/livepatch/ F: samples/livepatch/ F: tools/testing/selftests/livepatch/ diff --git a/include/linux/module.h b/include/linux/module.h index 1e135fd5c076..7ec9715de7dc 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -663,17 +663,14 @@ static inline bool module_requested_async_probing(str= uct module *module) return module && module->async_probe_requested; } =20 -#ifdef CONFIG_LIVEPATCH static inline bool is_livepatch_module(struct module *mod) { +#ifdef CONFIG_LIVEPATCH return mod->klp; -} -#else /* !CONFIG_LIVEPATCH */ -static inline bool is_livepatch_module(struct module *mod) -{ +#else return false; +#endif } -#endif /* CONFIG_LIVEPATCH */ =20 bool is_module_sig_enforced(void); void set_module_sig_enforced(void); diff --git a/kernel/module/Makefile b/kernel/module/Makefile index cdd5c61b8c7f..ed3aacb04f17 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -10,3 +10,4 @@ KCOV_INSTRUMENT_module.o :=3D n obj-y +=3D main.o obj-$(CONFIG_MODULE_DECOMPRESS) +=3D decompress.o obj-$(CONFIG_MODULE_SIG) +=3D signing.o +obj-$(CONFIG_LIVEPATCH) +=3D livepatch.o diff --git a/kernel/module/internal.h b/kernel/module/internal.h index e0775e66bcf7..ad7a444253ed 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -57,6 +57,28 @@ struct load_info { =20 int mod_verify_sig(const void *mod, struct load_info *info); =20 +#ifdef CONFIG_LIVEPATCH +int copy_module_elf(struct module *mod, struct load_info *info); +void free_module_elf(struct module *mod); +#else /* !CONFIG_LIVEPATCH */ +static inline int copy_module_elf(struct module *mod, struct load_info *in= fo) +{ + return 0; +} + +static inline void free_module_elf(struct module *mod) { } +#endif /* CONFIG_LIVEPATCH */ + +static inline bool set_livepatch_module(struct module *mod) +{ +#ifdef CONFIG_LIVEPATCH + mod->klp =3D true; + return true; +#else + return false; +#endif +} + #ifdef CONFIG_MODULE_DECOMPRESS int module_decompress(struct load_info *info, const void *buf, size_t size= ); void module_decompress_cleanup(struct load_info *info); diff --git a/kernel/module/livepatch.c b/kernel/module/livepatch.c new file mode 100644 index 000000000000..486d4ff92719 --- /dev/null +++ b/kernel/module/livepatch.c @@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Module livepatch support + * + * Copyright (C) 2016 Jessica Yu + */ + +#include +#include +#include +#include "internal.h" + +/* + * Persist Elf information about a module. Copy the Elf header, + * section header table, section string table, and symtab section + * index from info to mod->klp_info. + */ +int copy_module_elf(struct module *mod, struct load_info *info) +{ + unsigned int size, symndx; + int ret; + + size =3D sizeof(*mod->klp_info); + mod->klp_info =3D kmalloc(size, GFP_KERNEL); + if (!mod->klp_info) + return -ENOMEM; + + /* Elf header */ + size =3D sizeof(mod->klp_info->hdr); + memcpy(&mod->klp_info->hdr, info->hdr, size); + + /* Elf section header table */ + size =3D sizeof(*info->sechdrs) * info->hdr->e_shnum; + mod->klp_info->sechdrs =3D kmemdup(info->sechdrs, size, GFP_KERNEL); + if (!mod->klp_info->sechdrs) { + ret =3D -ENOMEM; + goto free_info; + } + + /* Elf section name string table */ + size =3D info->sechdrs[info->hdr->e_shstrndx].sh_size; + mod->klp_info->secstrings =3D kmemdup(info->secstrings, size, GFP_KERNEL); + if (!mod->klp_info->secstrings) { + ret =3D -ENOMEM; + goto free_sechdrs; + } + + /* Elf symbol section index */ + symndx =3D info->index.sym; + mod->klp_info->symndx =3D symndx; + + /* + * For livepatch modules, core_kallsyms.symtab is a complete + * copy of the original symbol table. Adjust sh_addr to point + * to core_kallsyms.symtab since the copy of the symtab in module + * init memory is freed at the end of do_init_module(). + */ + mod->klp_info->sechdrs[symndx].sh_addr =3D (unsigned long)mod->core_kalls= yms.symtab; + + return 0; + +free_sechdrs: + kfree(mod->klp_info->sechdrs); +free_info: + kfree(mod->klp_info); + return ret; +} + +void free_module_elf(struct module *mod) +{ + kfree(mod->klp_info->sechdrs); + kfree(mod->klp_info->secstrings); + kfree(mod->klp_info); +} diff --git a/kernel/module/main.c b/kernel/module/main.c index 5f5e21f972dd..3596ebf3a6c3 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2043,81 +2043,6 @@ static int module_enforce_rwx_sections(Elf_Ehdr *hdr= , Elf_Shdr *sechdrs, } #endif /* CONFIG_STRICT_MODULE_RWX */ =20 -#ifdef CONFIG_LIVEPATCH -/* - * Persist Elf information about a module. Copy the Elf header, - * section header table, section string table, and symtab section - * index from info to mod->klp_info. - */ -static int copy_module_elf(struct module *mod, struct load_info *info) -{ - unsigned int size, symndx; - int ret; - - size =3D sizeof(*mod->klp_info); - mod->klp_info =3D kmalloc(size, GFP_KERNEL); - if (mod->klp_info =3D=3D NULL) - return -ENOMEM; - - /* Elf header */ - size =3D sizeof(mod->klp_info->hdr); - memcpy(&mod->klp_info->hdr, info->hdr, size); - - /* Elf section header table */ - size =3D sizeof(*info->sechdrs) * info->hdr->e_shnum; - mod->klp_info->sechdrs =3D kmemdup(info->sechdrs, size, GFP_KERNEL); - if (mod->klp_info->sechdrs =3D=3D NULL) { - ret =3D -ENOMEM; - goto free_info; - } - - /* Elf section name string table */ - size =3D info->sechdrs[info->hdr->e_shstrndx].sh_size; - mod->klp_info->secstrings =3D kmemdup(info->secstrings, size, GFP_KERNEL); - if (mod->klp_info->secstrings =3D=3D NULL) { - ret =3D -ENOMEM; - goto free_sechdrs; - } - - /* Elf symbol section index */ - symndx =3D info->index.sym; - mod->klp_info->symndx =3D symndx; - - /* - * For livepatch modules, core_kallsyms.symtab is a complete - * copy of the original symbol table. Adjust sh_addr to point - * to core_kallsyms.symtab since the copy of the symtab in module - * init memory is freed at the end of do_init_module(). - */ - mod->klp_info->sechdrs[symndx].sh_addr =3D \ - (unsigned long) mod->core_kallsyms.symtab; - - return 0; - -free_sechdrs: - kfree(mod->klp_info->sechdrs); -free_info: - kfree(mod->klp_info); - return ret; -} - -static void free_module_elf(struct module *mod) -{ - kfree(mod->klp_info->sechdrs); - kfree(mod->klp_info->secstrings); - kfree(mod->klp_info); -} -#else /* !CONFIG_LIVEPATCH */ -static int copy_module_elf(struct module *mod, struct load_info *info) -{ - return 0; -} - -static void free_module_elf(struct module *mod) -{ -} -#endif /* CONFIG_LIVEPATCH */ - void __weak module_memfree(void *module_region) { /* @@ -3092,30 +3017,23 @@ static int copy_chunked_from_user(void *dst, const = void __user *usrc, unsigned l return 0; } =20 -#ifdef CONFIG_LIVEPATCH static int check_modinfo_livepatch(struct module *mod, struct load_info *i= nfo) { - if (get_modinfo(info, "livepatch")) { - mod->klp =3D true; + if (!get_modinfo(info, "livepatch")) + /* Nothing more to do */ + return 0; + + if (set_livepatch_module(mod)) { add_taint_module(mod, TAINT_LIVEPATCH, LOCKDEP_STILL_OK); pr_notice_once("%s: tainting kernel with TAINT_LIVEPATCH\n", - mod->name); - } - - return 0; -} -#else /* !CONFIG_LIVEPATCH */ -static int check_modinfo_livepatch(struct module *mod, struct load_info *i= nfo) -{ - if (get_modinfo(info, "livepatch")) { - pr_err("%s: module is marked as livepatch module, but livepatch support = is disabled", - mod->name); - return -ENOEXEC; + mod->name); + return 0; } =20 - return 0; + pr_err("%s: module is marked as livepatch module, but livepatch support i= s disabled", + mod->name); + return -ENOEXEC; } -#endif /* CONFIG_LIVEPATCH */ =20 static void check_modinfo_retpoline(struct module *mod, struct load_info *= info) { --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F386DC433EF for ; Mon, 7 Mar 2022 17:45:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237274AbiCGRqb (ORCPT ); Mon, 7 Mar 2022 12:46:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241029AbiCGRqT (ORCPT ); Mon, 7 Mar 2022 12:46:19 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1945771EE3 for ; Mon, 7 Mar 2022 09:45:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eMk2ddem3feNmKWVGBt5fQ2XD1104DD2sU5e2PuX3nw=; b=ekOkCBYAmA+0EAbd1FHcyH9ZRDFdd64iwq5t4sl62ZsjMJtkwikzWQTJBOMwfXgwGYBPHr HiS0C9x8NTesC8/i723JFQJ27nT72PJddvGYfFtJUzWcLw88V8qb7px0QLcOWnSu4eCcLN 34+pj0xk3EOkWfx3HFi+F3D85ALtEVk= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-628-6IWBsH32N1CBHAU5DgcQPw-1; Mon, 07 Mar 2022 12:45:23 -0500 X-MC-Unique: 6IWBsH32N1CBHAU5DgcQPw-1 Received: by mail-wr1-f71.google.com with SMTP id b9-20020a05600003c900b00203647caa11so44931wrg.5 for ; Mon, 07 Mar 2022 09:45:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eMk2ddem3feNmKWVGBt5fQ2XD1104DD2sU5e2PuX3nw=; b=rgM+eqF2k47Q/vXNmB3i6AE6YXLLOypW+/IgjHI9DGqrZqBva8N2XOHkauMShPjTXs EEWWQJW0ocR+G+tkKsGBEUm0awpFNFzhIp3bp5u7RK80c61iithHzhYkN2poFOPaF+co 3+EGU/yel1jXTXNteAgf005usjXMgplrAaMMLB+VpiD41kxZdTOr8e1/DYvmoZ4n0Nx+ rELiZ/ERi41qdXJGdH0VHtchqueC+P1R1CPTydsrrvt4WSz8AywBcrRUheqTq1gtr41d e0nUjTNeyMnOZmZZ7x4klBIKtkfzHqSNDK4RQwjIWVufehan7DULjtjpocJC9d9GAnZG azsw== X-Gm-Message-State: AOAM533uoogNYNO5PBYpIHIFgRWNY3/HReybvL8D0ZgNVWDbcSk5whyK SQ4o090rEla5NVtTGFyf3Vz4uxz6PrKRI33D/S6+8YTr9Q8RbM6pl8J487GxJs5wrq0BV4k3BxL BeoMzFl7KEXgIFt1991sRPnM= X-Received: by 2002:a05:600c:4e48:b0:381:83d8:54f6 with SMTP id e8-20020a05600c4e4800b0038183d854f6mr65871wmq.18.1646675121833; Mon, 07 Mar 2022 09:45:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJw7aGPSgMx2MfqQsJSKt2uS7l7l+iW9rZoDnf3OLhOavEcCVfuUUsqamFr37T+/NpSwfLA3+Q== X-Received: by 2002:a05:600c:4e48:b0:381:83d8:54f6 with SMTP id e8-20020a05600c4e4800b0038183d854f6mr65837wmq.18.1646675121596; Mon, 07 Mar 2022 09:45:21 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id q7-20020adfcd87000000b001e8a4f58a8csm11551719wrj.66.2022.03.07.09.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:45:20 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 05/14] module: Move latched RB-tree support to a separate file Date: Mon, 7 Mar 2022 17:45:00 +0000 Message-Id: <20220307174509.2887714-6-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. This patch migrates module latched RB-tree support (e.g. see __module_address()) from core module code into kernel/module/tree_lookup.c. Reviewed-by: Christophe Leroy Signed-off-by: Aaron Tomlin --- kernel/module/Makefile | 1 + kernel/module/internal.h | 33 +++++++++ kernel/module/main.c | 130 ++---------------------------------- kernel/module/tree_lookup.c | 109 ++++++++++++++++++++++++++++++ 4 files changed, 147 insertions(+), 126 deletions(-) create mode 100644 kernel/module/tree_lookup.c diff --git a/kernel/module/Makefile b/kernel/module/Makefile index ed3aacb04f17..88774e386276 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -11,3 +11,4 @@ obj-y +=3D main.o obj-$(CONFIG_MODULE_DECOMPRESS) +=3D decompress.o obj-$(CONFIG_MODULE_SIG) +=3D signing.o obj-$(CONFIG_LIVEPATCH) +=3D livepatch.o +obj-$(CONFIG_MODULES_TREE_LOOKUP) +=3D tree_lookup.o diff --git a/kernel/module/internal.h b/kernel/module/internal.h index ad7a444253ed..f1682e3677be 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -9,6 +9,7 @@ #include #include #include +#include =20 #ifndef ARCH_SHF_SMALL #define ARCH_SHF_SMALL 0 @@ -93,3 +94,35 @@ static inline void module_decompress_cleanup(struct load= _info *info) { } #endif + +#ifdef CONFIG_MODULES_TREE_LOOKUP +struct mod_tree_root { + struct latch_tree_root root; + unsigned long addr_min; + unsigned long addr_max; +}; + +extern struct mod_tree_root mod_tree; + +void mod_tree_insert(struct module *mod); +void mod_tree_remove_init(struct module *mod); +void mod_tree_remove(struct module *mod); +struct module *mod_find(unsigned long addr); +#else /* !CONFIG_MODULES_TREE_LOOKUP */ + +static inline void mod_tree_insert(struct module *mod) { } +static inline void mod_tree_remove_init(struct module *mod) { } +static inline void mod_tree_remove(struct module *mod) { } +static inline struct module *mod_find(unsigned long addr) +{ + struct module *mod; + + list_for_each_entry_rcu(mod, &modules, list, + lockdep_is_held(&module_mutex)) { + if (within_module(addr, mod)) + return mod; + } + + return NULL; +} +#endif /* CONFIG_MODULES_TREE_LOOKUP */ diff --git a/kernel/module/main.c b/kernel/module/main.c index 3596ebf3a6c3..76b53880ad91 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -90,138 +90,16 @@ static DECLARE_WORK(init_free_wq, do_free_init); static LLIST_HEAD(init_free_list); =20 #ifdef CONFIG_MODULES_TREE_LOOKUP - -/* - * Use a latched RB-tree for __module_address(); this allows us to use - * RCU-sched lookups of the address from any context. - * - * This is conditional on PERF_EVENTS || TRACING because those can really = hit - * __module_address() hard by doing a lot of stack unwinding; potentially = from - * NMI context. - */ - -static __always_inline unsigned long __mod_tree_val(struct latch_tree_node= *n) -{ - struct module_layout *layout =3D container_of(n, struct module_layout, mt= n.node); - - return (unsigned long)layout->base; -} - -static __always_inline unsigned long __mod_tree_size(struct latch_tree_nod= e *n) -{ - struct module_layout *layout =3D container_of(n, struct module_layout, mt= n.node); - - return (unsigned long)layout->size; -} - -static __always_inline bool -mod_tree_less(struct latch_tree_node *a, struct latch_tree_node *b) -{ - return __mod_tree_val(a) < __mod_tree_val(b); -} - -static __always_inline int -mod_tree_comp(void *key, struct latch_tree_node *n) -{ - unsigned long val =3D (unsigned long)key; - unsigned long start, end; - - start =3D __mod_tree_val(n); - if (val < start) - return -1; - - end =3D start + __mod_tree_size(n); - if (val >=3D end) - return 1; - - return 0; -} - -static const struct latch_tree_ops mod_tree_ops =3D { - .less =3D mod_tree_less, - .comp =3D mod_tree_comp, -}; - -static struct mod_tree_root { - struct latch_tree_root root; - unsigned long addr_min; - unsigned long addr_max; -} mod_tree __cacheline_aligned =3D { +struct mod_tree_root mod_tree __cacheline_aligned =3D { .addr_min =3D -1UL, }; =20 #define module_addr_min mod_tree.addr_min #define module_addr_max mod_tree.addr_max =20 -static noinline void __mod_tree_insert(struct mod_tree_node *node) -{ - latch_tree_insert(&node->node, &mod_tree.root, &mod_tree_ops); -} - -static void __mod_tree_remove(struct mod_tree_node *node) -{ - latch_tree_erase(&node->node, &mod_tree.root, &mod_tree_ops); -} - -/* - * These modifications: insert, remove_init and remove; are serialized by = the - * module_mutex. - */ -static void mod_tree_insert(struct module *mod) -{ - mod->core_layout.mtn.mod =3D mod; - mod->init_layout.mtn.mod =3D mod; - - __mod_tree_insert(&mod->core_layout.mtn); - if (mod->init_layout.size) - __mod_tree_insert(&mod->init_layout.mtn); -} - -static void mod_tree_remove_init(struct module *mod) -{ - if (mod->init_layout.size) - __mod_tree_remove(&mod->init_layout.mtn); -} - -static void mod_tree_remove(struct module *mod) -{ - __mod_tree_remove(&mod->core_layout.mtn); - mod_tree_remove_init(mod); -} - -static struct module *mod_find(unsigned long addr) -{ - struct latch_tree_node *ltn; - - ltn =3D latch_tree_find((void *)addr, &mod_tree.root, &mod_tree_ops); - if (!ltn) - return NULL; - - return container_of(ltn, struct mod_tree_node, node)->mod; -} - -#else /* MODULES_TREE_LOOKUP */ - -static unsigned long module_addr_min =3D -1UL, module_addr_max =3D 0; - -static void mod_tree_insert(struct module *mod) { } -static void mod_tree_remove_init(struct module *mod) { } -static void mod_tree_remove(struct module *mod) { } - -static struct module *mod_find(unsigned long addr) -{ - struct module *mod; - - list_for_each_entry_rcu(mod, &modules, list, - lockdep_is_held(&module_mutex)) { - if (within_module(addr, mod)) - return mod; - } - - return NULL; -} - -#endif /* MODULES_TREE_LOOKUP */ +#else /* !CONFIG_MODULES_TREE_LOOKUP */ +static unsigned long module_addr_min =3D -1UL, module_addr_max; +#endif /* CONFIG_MODULES_TREE_LOOKUP */ =20 /* * Bounds of module text, for speeding up __module_address. diff --git a/kernel/module/tree_lookup.c b/kernel/module/tree_lookup.c new file mode 100644 index 000000000000..0bc4ec3b22ce --- /dev/null +++ b/kernel/module/tree_lookup.c @@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Modules tree lookup + * + * Copyright (C) 2015 Peter Zijlstra + * Copyright (C) 2015 Rusty Russell + */ + +#include +#include +#include "internal.h" + +/* + * Use a latched RB-tree for __module_address(); this allows us to use + * RCU-sched lookups of the address from any context. + * + * This is conditional on PERF_EVENTS || TRACING because those can really = hit + * __module_address() hard by doing a lot of stack unwinding; potentially = from + * NMI context. + */ + +static __always_inline unsigned long __mod_tree_val(struct latch_tree_node= *n) +{ + struct module_layout *layout =3D container_of(n, struct module_layout, mt= n.node); + + return (unsigned long)layout->base; +} + +static __always_inline unsigned long __mod_tree_size(struct latch_tree_nod= e *n) +{ + struct module_layout *layout =3D container_of(n, struct module_layout, mt= n.node); + + return (unsigned long)layout->size; +} + +static __always_inline bool +mod_tree_less(struct latch_tree_node *a, struct latch_tree_node *b) +{ + return __mod_tree_val(a) < __mod_tree_val(b); +} + +static __always_inline int +mod_tree_comp(void *key, struct latch_tree_node *n) +{ + unsigned long val =3D (unsigned long)key; + unsigned long start, end; + + start =3D __mod_tree_val(n); + if (val < start) + return -1; + + end =3D start + __mod_tree_size(n); + if (val >=3D end) + return 1; + + return 0; +} + +static const struct latch_tree_ops mod_tree_ops =3D { + .less =3D mod_tree_less, + .comp =3D mod_tree_comp, +}; + +static noinline void __mod_tree_insert(struct mod_tree_node *node) +{ + latch_tree_insert(&node->node, &mod_tree.root, &mod_tree_ops); +} + +static void __mod_tree_remove(struct mod_tree_node *node) +{ + latch_tree_erase(&node->node, &mod_tree.root, &mod_tree_ops); +} + +/* + * These modifications: insert, remove_init and remove; are serialized by = the + * module_mutex. + */ +void mod_tree_insert(struct module *mod) +{ + mod->core_layout.mtn.mod =3D mod; + mod->init_layout.mtn.mod =3D mod; + + __mod_tree_insert(&mod->core_layout.mtn); + if (mod->init_layout.size) + __mod_tree_insert(&mod->init_layout.mtn); +} + +void mod_tree_remove_init(struct module *mod) +{ + if (mod->init_layout.size) + __mod_tree_remove(&mod->init_layout.mtn); +} + +void mod_tree_remove(struct module *mod) +{ + __mod_tree_remove(&mod->core_layout.mtn); + mod_tree_remove_init(mod); +} + +struct module *mod_find(unsigned long addr) +{ + struct latch_tree_node *ltn; + + ltn =3D latch_tree_find((void *)addr, &mod_tree.root, &mod_tree_ops); + if (!ltn) + return NULL; + + return container_of(ltn, struct mod_tree_node, node)->mod; +} --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE10DC433EF for ; Mon, 7 Mar 2022 17:45:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244541AbiCGRqk (ORCPT ); Mon, 7 Mar 2022 12:46:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244499AbiCGRqa (ORCPT ); Mon, 7 Mar 2022 12:46:30 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 51BCD8F98C for ; Mon, 7 Mar 2022 09:45:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Izr11YJzmvAe+LaxIWKRd054OpBnoHmXtcTT48M4YnE=; b=MDn39MOVF30M/vf890m2FoXVOWFdz1kboYrkGFkhg/FG9WZK0kgQDPTv6gM1x/wq8OBIeC Mz2cOAUga7u2cKABvufOD+pL2rGdismDV6MCz6IQ0ScFrS0dQs5Skd8hYV0W50lYpZfvdP upTH3ZxdIttGwGtW6bpNk26D0BxfgHU= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-365-g_YuM04FPXu53ecXm7b3RA-1; Mon, 07 Mar 2022 12:45:26 -0500 X-MC-Unique: g_YuM04FPXu53ecXm7b3RA-1 Received: by mail-wr1-f72.google.com with SMTP id w17-20020adfec51000000b001f068bc3342so2581693wrn.6 for ; Mon, 07 Mar 2022 09:45:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Izr11YJzmvAe+LaxIWKRd054OpBnoHmXtcTT48M4YnE=; b=S1755Jfif3+bf/1YdGPnGUG7tFtd3P64WVzdRO10gnT31yk4HBVAeuD0YVGheFVWJM KKycQGO/jB90i6E8ZbMEO7WLerKSrXCbGtEjm/jp/kINc/fzdNAZW7gZGpnK5vX3e7rd qdl+d3uGsk9qKqhl5lfqwiI8titA9tvBwCv7WaPi47Tn88DroFVSMT+bVymUGNSoTldy xPaPCcuMOYeKeR7bYgBnI3jN+upOPOGLSIlhitZQe5WFwFR1KvPowKiYOtHT/2EybheC H6D9g4alCAqi4iaqi298UullLwZZK+tJNo//tikydSR6rtFKIUR3GjP3+8bhVlf7by9B kfqw== X-Gm-Message-State: AOAM530qDUGFmczWdlHz1fMl2DCnyvFIWxfxz3t9pODiiSAHXN6pKKQG JHn7smeiVZcv8I77uP43P+wh5oZBvQJ/y5zcSlarmrnMsoK41lbiUavSamBnaUjXCgW8DsbuRCe PA8BXGxIezNH78jvu5DSfw3w= X-Received: by 2002:adf:d210:0:b0:1f1:f999:b538 with SMTP id j16-20020adfd210000000b001f1f999b538mr3588036wrh.473.1646675123760; Mon, 07 Mar 2022 09:45:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxb5w+w7CFOgu1zjnzCFgdbsnCNEsZq0rjDd1e1ggNugHkI9xGIFt0t+J3VttV4QqncG0m/ig== X-Received: by 2002:adf:d210:0:b0:1f1:f999:b538 with SMTP id j16-20020adfd210000000b001f1f999b538mr3588006wrh.473.1646675123542; Mon, 07 Mar 2022 09:45:23 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id r16-20020a05600c35d000b00389a826abd3sm2943258wmq.42.2022.03.07.09.45.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:45:22 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 06/14] module: Move strict rwx support to a separate file Date: Mon, 7 Mar 2022 17:45:01 +0000 Message-Id: <20220307174509.2887714-7-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. This patch migrates code that makes module text and rodata memory read-only and non-text memory non-executable from core module code into kernel/module/strict_rwx.c. Reviewed-by: Christophe Leroy Signed-off-by: Aaron Tomlin --- kernel/module/Makefile | 1 + kernel/module/internal.h | 32 ++++++++++++ kernel/module/main.c | 99 +------------------------------------- kernel/module/strict_rwx.c | 85 ++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 97 deletions(-) create mode 100644 kernel/module/strict_rwx.c diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 88774e386276..d313c8472cb3 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -12,3 +12,4 @@ obj-$(CONFIG_MODULE_DECOMPRESS) +=3D decompress.o obj-$(CONFIG_MODULE_SIG) +=3D signing.o obj-$(CONFIG_LIVEPATCH) +=3D livepatch.o obj-$(CONFIG_MODULES_TREE_LOOKUP) +=3D tree_lookup.o +obj-$(CONFIG_STRICT_MODULE_RWX) +=3D strict_rwx.o diff --git a/kernel/module/internal.h b/kernel/module/internal.h index f1682e3677be..a6895bb5598a 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -20,6 +20,17 @@ /* Maximum number of characters written by module_flags() */ #define MODULE_FLAGS_BUF_SIZE (TAINT_FLAGS_COUNT + 4) =20 +/* + * Modules' sections will be aligned on page boundaries + * to ensure complete separation of code and data, but + * only when CONFIG_ARCH_HAS_STRICT_MODULE_RWX=3Dy + */ +#ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX +# define debug_align(X) PAGE_ALIGN(X) +#else +# define debug_align(X) (X) +#endif + extern struct mutex module_mutex; extern struct list_head modules; =20 @@ -126,3 +137,24 @@ static inline struct module *mod_find(unsigned long ad= dr) return NULL; } #endif /* CONFIG_MODULES_TREE_LOOKUP */ + +#ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX +void frob_text(const struct module_layout *layout, int (*set_memory)(unsig= ned long start, + int num_pages)); +#endif /* CONFIG_ARCH_HAS_STRICT_MODULE_RWX */ + +#ifdef CONFIG_STRICT_MODULE_RWX +void module_enable_ro(const struct module *mod, bool after_init); +void module_enable_nx(const struct module *mod); +int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, + char *secstrings, struct module *mod); + +#else /* !CONFIG_STRICT_MODULE_RWX */ +static inline void module_enable_nx(const struct module *mod) { } +static inline void module_enable_ro(const struct module *mod, bool after_i= nit) {} +static inline int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sec= hdrs, + char *secstrings, struct module *mod) +{ + return 0; +} +#endif /* CONFIG_STRICT_MODULE_RWX */ diff --git a/kernel/module/main.c b/kernel/module/main.c index 76b53880ad91..5cd63f14b1ef 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -63,17 +63,6 @@ #define CREATE_TRACE_POINTS #include =20 -/* - * Modules' sections will be aligned on page boundaries - * to ensure complete separation of code and data, but - * only when CONFIG_ARCH_HAS_STRICT_MODULE_RWX=3Dy - */ -#ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX -# define debug_align(X) ALIGN(X, PAGE_SIZE) -#else -# define debug_align(X) (X) -#endif - /* * Mutex protects: * 1) List of modules (also safely readable with preempt_disable), @@ -1819,8 +1808,8 @@ static void mod_sysfs_teardown(struct module *mod) * whether we are strict. */ #ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX -static void frob_text(const struct module_layout *layout, - int (*set_memory)(unsigned long start, int num_pages)) +void frob_text(const struct module_layout *layout, + int (*set_memory)(unsigned long start, int num_pages)) { BUG_ON((unsigned long)layout->base & (PAGE_SIZE-1)); BUG_ON((unsigned long)layout->text_size & (PAGE_SIZE-1)); @@ -1837,90 +1826,6 @@ static void module_enable_x(const struct module *mod) static void module_enable_x(const struct module *mod) { } #endif /* CONFIG_ARCH_HAS_STRICT_MODULE_RWX */ =20 -#ifdef CONFIG_STRICT_MODULE_RWX -static void frob_rodata(const struct module_layout *layout, - int (*set_memory)(unsigned long start, int num_pages)) -{ - BUG_ON((unsigned long)layout->base & (PAGE_SIZE-1)); - BUG_ON((unsigned long)layout->text_size & (PAGE_SIZE-1)); - BUG_ON((unsigned long)layout->ro_size & (PAGE_SIZE-1)); - set_memory((unsigned long)layout->base + layout->text_size, - (layout->ro_size - layout->text_size) >> PAGE_SHIFT); -} - -static void frob_ro_after_init(const struct module_layout *layout, - int (*set_memory)(unsigned long start, int num_pages)) -{ - BUG_ON((unsigned long)layout->base & (PAGE_SIZE-1)); - BUG_ON((unsigned long)layout->ro_size & (PAGE_SIZE-1)); - BUG_ON((unsigned long)layout->ro_after_init_size & (PAGE_SIZE-1)); - set_memory((unsigned long)layout->base + layout->ro_size, - (layout->ro_after_init_size - layout->ro_size) >> PAGE_SHIFT); -} - -static void frob_writable_data(const struct module_layout *layout, - int (*set_memory)(unsigned long start, int num_pages)) -{ - BUG_ON((unsigned long)layout->base & (PAGE_SIZE-1)); - BUG_ON((unsigned long)layout->ro_after_init_size & (PAGE_SIZE-1)); - BUG_ON((unsigned long)layout->size & (PAGE_SIZE-1)); - set_memory((unsigned long)layout->base + layout->ro_after_init_size, - (layout->size - layout->ro_after_init_size) >> PAGE_SHIFT); -} - -static void module_enable_ro(const struct module *mod, bool after_init) -{ - if (!rodata_enabled) - return; - - set_vm_flush_reset_perms(mod->core_layout.base); - set_vm_flush_reset_perms(mod->init_layout.base); - frob_text(&mod->core_layout, set_memory_ro); - - frob_rodata(&mod->core_layout, set_memory_ro); - frob_text(&mod->init_layout, set_memory_ro); - frob_rodata(&mod->init_layout, set_memory_ro); - - if (after_init) - frob_ro_after_init(&mod->core_layout, set_memory_ro); -} - -static void module_enable_nx(const struct module *mod) -{ - frob_rodata(&mod->core_layout, set_memory_nx); - frob_ro_after_init(&mod->core_layout, set_memory_nx); - frob_writable_data(&mod->core_layout, set_memory_nx); - frob_rodata(&mod->init_layout, set_memory_nx); - frob_writable_data(&mod->init_layout, set_memory_nx); -} - -static int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, - char *secstrings, struct module *mod) -{ - const unsigned long shf_wx =3D SHF_WRITE|SHF_EXECINSTR; - int i; - - for (i =3D 0; i < hdr->e_shnum; i++) { - if ((sechdrs[i].sh_flags & shf_wx) =3D=3D shf_wx) { - pr_err("%s: section %s (index %d) has invalid WRITE|EXEC flags\n", - mod->name, secstrings + sechdrs[i].sh_name, i); - return -ENOEXEC; - } - } - - return 0; -} - -#else /* !CONFIG_STRICT_MODULE_RWX */ -static void module_enable_nx(const struct module *mod) { } -static void module_enable_ro(const struct module *mod, bool after_init) {} -static int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, - char *secstrings, struct module *mod) -{ - return 0; -} -#endif /* CONFIG_STRICT_MODULE_RWX */ - void __weak module_memfree(void *module_region) { /* diff --git a/kernel/module/strict_rwx.c b/kernel/module/strict_rwx.c new file mode 100644 index 000000000000..7949dfd449c2 --- /dev/null +++ b/kernel/module/strict_rwx.c @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Module strict rwx + * + * Copyright (C) 2015 Rusty Russell + */ + +#include +#include +#include +#include +#include "internal.h" + +static void frob_rodata(const struct module_layout *layout, + int (*set_memory)(unsigned long start, int num_pages)) +{ + BUG_ON(!PAGE_ALIGNED(layout->base)); + BUG_ON(!PAGE_ALIGNED(layout->text_size)); + BUG_ON(!PAGE_ALIGNED(layout->ro_size)); + set_memory((unsigned long)layout->base + layout->text_size, + (layout->ro_size - layout->text_size) >> PAGE_SHIFT); +} + +static void frob_ro_after_init(const struct module_layout *layout, + int (*set_memory)(unsigned long start, int num_pages)) +{ + BUG_ON(!PAGE_ALIGNED(layout->base)); + BUG_ON(!PAGE_ALIGNED(layout->ro_size)); + BUG_ON(!PAGE_ALIGNED(layout->ro_after_init_size)); + set_memory((unsigned long)layout->base + layout->ro_size, + (layout->ro_after_init_size - layout->ro_size) >> PAGE_SHIFT); +} + +static void frob_writable_data(const struct module_layout *layout, + int (*set_memory)(unsigned long start, int num_pages)) +{ + BUG_ON(!PAGE_ALIGNED(layout->base)); + BUG_ON(!PAGE_ALIGNED(layout->ro_after_init_size)); + BUG_ON(!PAGE_ALIGNED(layout->size)); + set_memory((unsigned long)layout->base + layout->ro_after_init_size, + (layout->size - layout->ro_after_init_size) >> PAGE_SHIFT); +} + +void module_enable_ro(const struct module *mod, bool after_init) +{ + if (!rodata_enabled) + return; + + set_vm_flush_reset_perms(mod->core_layout.base); + set_vm_flush_reset_perms(mod->init_layout.base); + frob_text(&mod->core_layout, set_memory_ro); + + frob_rodata(&mod->core_layout, set_memory_ro); + frob_text(&mod->init_layout, set_memory_ro); + frob_rodata(&mod->init_layout, set_memory_ro); + + if (after_init) + frob_ro_after_init(&mod->core_layout, set_memory_ro); +} + +void module_enable_nx(const struct module *mod) +{ + frob_rodata(&mod->core_layout, set_memory_nx); + frob_ro_after_init(&mod->core_layout, set_memory_nx); + frob_writable_data(&mod->core_layout, set_memory_nx); + frob_rodata(&mod->init_layout, set_memory_nx); + frob_writable_data(&mod->init_layout, set_memory_nx); +} + +int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, + char *secstrings, struct module *mod) +{ + const unsigned long shf_wx =3D SHF_WRITE | SHF_EXECINSTR; + int i; + + for (i =3D 0; i < hdr->e_shnum; i++) { + if ((sechdrs[i].sh_flags & shf_wx) =3D=3D shf_wx) { + pr_err("%s: section %s (index %d) has invalid WRITE|EXEC flags\n", + mod->name, secstrings + sechdrs[i].sh_name, i); + return -ENOEXEC; + } + } + + return 0; +} --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F962C433EF for ; Mon, 7 Mar 2022 17:45:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244539AbiCGRqn (ORCPT ); Mon, 7 Mar 2022 12:46:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244504AbiCGRqe (ORCPT ); Mon, 7 Mar 2022 12:46:34 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0492B90278 for ; Mon, 7 Mar 2022 09:45:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=apZpBB6s8ANx6PnqHZt1W7YrWPlcLByEn5Sm08WSqaI=; b=gV7qPDeQfiNnTqBSW7qp/wdD0zK4S3NAuRzmruwWTfnYIoBAvBMjZdY51ZuRwF6THeCBTj uAuSoFW4wX9llaDiij0i3ZTQwuG28yX/bz/vZmVO2068Bt3QFU5VH2mmiLkIQlQJNN6TWM PX131tQQTzyC9K7xUXsibVSRQZ+pPks= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-323-XqoNn1bcMZKQD39kOicFUQ-1; Mon, 07 Mar 2022 12:45:27 -0500 X-MC-Unique: XqoNn1bcMZKQD39kOicFUQ-1 Received: by mail-wr1-f72.google.com with SMTP id z1-20020adfec81000000b001f1f7e7ec99so850487wrn.17 for ; Mon, 07 Mar 2022 09:45:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=apZpBB6s8ANx6PnqHZt1W7YrWPlcLByEn5Sm08WSqaI=; b=aEu30HK2TZJJQJ7QvFK1ZZK2JNHXxNimc7COyeH5B/D5+U1eYSrWcrWs5SD9NRoolc 26qkozdEt5GVrrRzF7jAYEh1TFQ8dm5mgZ5xeZSZA1kkUwM4O36xpdVXj63SHsu6PwW9 BRejiczHaQZykh2SpAqWGl3qWnKBAiwSKlORaVXBWCDAX7cqE1mAEz7OyrkZyi9g8wIi HtrScSbaehNh+4uanC5ngdZxZXdNYvsY44Mp5ta9tfjrqSqT7+M1YIlQeeCq0jy9bTT+ KO6XxQtvVKHlbWWL5fSLJgBXE5YjCiuqpPmhPJsik05Pgq3hup/XeE5iXoPhWre/4cfa XEuQ== X-Gm-Message-State: AOAM533/wMaO9pkaTj6dum6fP7SeBVMsizqlaSQv2JmIf5bVKdycYTwr yeWXBhYbnDsfB1KYp8grVl8VAEmE4tA8v1POl/Bi1zTiD97ikS/6p6WmzhtNSye/rjeun7amd+h 48MFOdZX1lMy0ZIBhMNYywAA= X-Received: by 2002:a5d:47ca:0:b0:1ef:d6ae:591a with SMTP id o10-20020a5d47ca000000b001efd6ae591amr8816973wrc.358.1646675125783; Mon, 07 Mar 2022 09:45:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQZDKYDmiZfDW76IesytM1KFQWFYcPPgT3Fl39F45QSnJcrKVEh5ixjTrr1DuSBJjyrSRO5Q== X-Received: by 2002:a5d:47ca:0:b0:1ef:d6ae:591a with SMTP id o10-20020a5d47ca000000b001efd6ae591amr8816954wrc.358.1646675125431; Mon, 07 Mar 2022 09:45:25 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id l13-20020a5d4bcd000000b001f0620ecb3csm10779965wrt.40.2022.03.07.09.45.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:45:24 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 07/14] module: Move extra signature support out of core code Date: Mon, 7 Mar 2022 17:45:02 +0000 Message-Id: <20220307174509.2887714-8-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. This patch migrates additional module signature check code from core module code into kernel/module/signing.c. Reviewed-by: Christophe Leroy Signed-off-by: Aaron Tomlin --- include/linux/module.h | 12 +++--- kernel/module/internal.h | 9 +++++ kernel/module/main.c | 87 ---------------------------------------- kernel/module/signing.c | 77 +++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 92 deletions(-) diff --git a/include/linux/module.h b/include/linux/module.h index 7ec9715de7dc..5e2059f3afc7 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -672,7 +672,6 @@ static inline bool is_livepatch_module(struct module *m= od) #endif } =20 -bool is_module_sig_enforced(void); void set_module_sig_enforced(void); =20 #else /* !CONFIG_MODULES... */ @@ -799,10 +798,6 @@ static inline bool module_requested_async_probing(stru= ct module *module) return false; } =20 -static inline bool is_module_sig_enforced(void) -{ - return false; -} =20 static inline void set_module_sig_enforced(void) { @@ -854,11 +849,18 @@ static inline bool retpoline_module_ok(bool has_retpo= line) #endif =20 #ifdef CONFIG_MODULE_SIG +bool is_module_sig_enforced(void); + static inline bool module_sig_ok(struct module *module) { return module->sig_ok; } #else /* !CONFIG_MODULE_SIG */ +static inline bool is_module_sig_enforced(void) +{ + return false; +} + static inline bool module_sig_ok(struct module *module) { return true; diff --git a/kernel/module/internal.h b/kernel/module/internal.h index a6895bb5598a..d6f646a5da41 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -158,3 +158,12 @@ static inline int module_enforce_rwx_sections(Elf_Ehdr= *hdr, Elf_Shdr *sechdrs, return 0; } #endif /* CONFIG_STRICT_MODULE_RWX */ + +#ifdef CONFIG_MODULE_SIG +int module_sig_check(struct load_info *info, int flags); +#else /* !CONFIG_MODULE_SIG */ +static inline int module_sig_check(struct load_info *info, int flags) +{ + return 0; +} +#endif /* !CONFIG_MODULE_SIG */ diff --git a/kernel/module/main.c b/kernel/module/main.c index 5cd63f14b1ef..c63e10c61694 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -127,28 +126,6 @@ static void module_assert_mutex_or_preempt(void) #endif } =20 -#ifdef CONFIG_MODULE_SIG -static bool sig_enforce =3D IS_ENABLED(CONFIG_MODULE_SIG_FORCE); -module_param(sig_enforce, bool_enable_only, 0644); - -void set_module_sig_enforced(void) -{ - sig_enforce =3D true; -} -#else -#define sig_enforce false -#endif - -/* - * Export sig_enforce kernel cmdline parameter to allow other subsystems r= ely - * on that instead of directly to CONFIG_MODULE_SIG_FORCE config. - */ -bool is_module_sig_enforced(void) -{ - return sig_enforce; -} -EXPORT_SYMBOL(is_module_sig_enforced); - /* Block module loading/unloading? */ int modules_disabled =3D 0; core_param(nomodule, modules_disabled, bint, 0); @@ -2569,70 +2546,6 @@ static inline void kmemleak_load_module(const struct= module *mod, } #endif =20 -#ifdef CONFIG_MODULE_SIG -static int module_sig_check(struct load_info *info, int flags) -{ - int err =3D -ENODATA; - const unsigned long markerlen =3D sizeof(MODULE_SIG_STRING) - 1; - const char *reason; - const void *mod =3D info->hdr; - bool mangled_module =3D flags & (MODULE_INIT_IGNORE_MODVERSIONS | - MODULE_INIT_IGNORE_VERMAGIC); - /* - * Do not allow mangled modules as a module with version information - * removed is no longer the module that was signed. - */ - if (!mangled_module && - info->len > markerlen && - memcmp(mod + info->len - markerlen, MODULE_SIG_STRING, markerlen) =3D= =3D 0) { - /* We truncate the module to discard the signature */ - info->len -=3D markerlen; - err =3D mod_verify_sig(mod, info); - if (!err) { - info->sig_ok =3D true; - return 0; - } - } - - /* - * We don't permit modules to be loaded into the trusted kernels - * without a valid signature on them, but if we're not enforcing, - * certain errors are non-fatal. - */ - switch (err) { - case -ENODATA: - reason =3D "unsigned module"; - break; - case -ENOPKG: - reason =3D "module with unsupported crypto"; - break; - case -ENOKEY: - reason =3D "module with unavailable key"; - break; - - default: - /* - * All other errors are fatal, including lack of memory, - * unparseable signatures, and signature check failures -- - * even if signatures aren't required. - */ - return err; - } - - if (is_module_sig_enforced()) { - pr_notice("Loading of %s is rejected\n", reason); - return -EKEYREJECTED; - } - - return security_locked_down(LOCKDOWN_MODULE_SIGNATURE); -} -#else /* !CONFIG_MODULE_SIG */ -static int module_sig_check(struct load_info *info, int flags) -{ - return 0; -} -#endif /* !CONFIG_MODULE_SIG */ - static int validate_section_offset(struct load_info *info, Elf_Shdr *shdr) { #if defined(CONFIG_64BIT) diff --git a/kernel/module/signing.c b/kernel/module/signing.c index 8aeb6d2ee94b..85c8999dfecf 100644 --- a/kernel/module/signing.c +++ b/kernel/module/signing.c @@ -11,9 +11,29 @@ #include #include #include +#include #include +#include #include "internal.h" =20 +static bool sig_enforce =3D IS_ENABLED(CONFIG_MODULE_SIG_FORCE); +module_param(sig_enforce, bool_enable_only, 0644); + +/* + * Export sig_enforce kernel cmdline parameter to allow other subsystems r= ely + * on that instead of directly to CONFIG_MODULE_SIG_FORCE config. + */ +bool is_module_sig_enforced(void) +{ + return sig_enforce; +} +EXPORT_SYMBOL(is_module_sig_enforced); + +void set_module_sig_enforced(void) +{ + sig_enforce =3D true; +} + /* * Verify the signature on a module. */ @@ -43,3 +63,60 @@ int mod_verify_sig(const void *mod, struct load_info *in= fo) VERIFYING_MODULE_SIGNATURE, NULL, NULL); } + +int module_sig_check(struct load_info *info, int flags) +{ + int err =3D -ENODATA; + const unsigned long markerlen =3D sizeof(MODULE_SIG_STRING) - 1; + const char *reason; + const void *mod =3D info->hdr; + bool mangled_module =3D flags & (MODULE_INIT_IGNORE_MODVERSIONS | + MODULE_INIT_IGNORE_VERMAGIC); + /* + * Do not allow mangled modules as a module with version information + * removed is no longer the module that was signed. + */ + if (!mangled_module && + info->len > markerlen && + memcmp(mod + info->len - markerlen, MODULE_SIG_STRING, markerlen) =3D= =3D 0) { + /* We truncate the module to discard the signature */ + info->len -=3D markerlen; + err =3D mod_verify_sig(mod, info); + if (!err) { + info->sig_ok =3D true; + return 0; + } + } + + /* + * We don't permit modules to be loaded into the trusted kernels + * without a valid signature on them, but if we're not enforcing, + * certain errors are non-fatal. + */ + switch (err) { + case -ENODATA: + reason =3D "unsigned module"; + break; + case -ENOPKG: + reason =3D "module with unsupported crypto"; + break; + case -ENOKEY: + reason =3D "module with unavailable key"; + break; + + default: + /* + * All other errors are fatal, including lack of memory, + * unparseable signatures, and signature check failures -- + * even if signatures aren't required. + */ + return err; + } + + if (is_module_sig_enforced()) { + pr_notice("Loading of %s is rejected\n", reason); + return -EKEYREJECTED; + } + + return security_locked_down(LOCKDOWN_MODULE_SIGNATURE); +} --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15F52C433FE for ; Mon, 7 Mar 2022 17:45:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244533AbiCGRqs (ORCPT ); Mon, 7 Mar 2022 12:46:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244507AbiCGRqf (ORCPT ); Mon, 7 Mar 2022 12:46:35 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D261E939AD for ; Mon, 7 Mar 2022 09:45:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EwM5m/UKCLcQUodhjTTwfqA0OAG1WbMnIR0FKcI9qsQ=; b=SQtwZ7R9494XU/RfnykcmXiNrKQ+e+wR0XxLaNtl70c4NMsp8PkoBIwDkDr3xv/8+ltDh6 yKsvSCr3FIa5L63hlTJIs9+s9pTBgjgmKJPW8PvKKq8K1smNJpRjY6OhCYEn1BEIsQVVzW F0s64sGtSNOf/IxlMc7G91FXTX4dRbw= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-635-FUnWVB2fMryNGzFnYRokwQ-1; Mon, 07 Mar 2022 12:45:29 -0500 X-MC-Unique: FUnWVB2fMryNGzFnYRokwQ-1 Received: by mail-wm1-f70.google.com with SMTP id 20-20020a05600c231400b00389886f6b23so4875727wmo.6 for ; Mon, 07 Mar 2022 09:45:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EwM5m/UKCLcQUodhjTTwfqA0OAG1WbMnIR0FKcI9qsQ=; b=ZW3oGoKXZzR3TjaKDbKM9lz7iAsiN5D/gETFIrs2JiXxWjYFbyjE4r8OKZwyhbCYgQ Qwvx87tEO1lx5F9KDkmgUJF6qLxoJAQPLNlepYPo+gekUZWwhdIqZ9cRypYmi5u7ZY5U GAnTVZtk+GzYy4gFt8/AiVqzglEZnulRlL+kBNXPFGdSSmCA66ahH8/5MmksvrkaDbiW CecWQKi/+IMCeCdtHu/vkefkQqZjym1NP6AjkMRCNq6QsSab5OeWqp5LT4OfKoreOhHl paPrFTkq1l6lgItSHpy2tm/U6sfngwFmoDJ2DumZpYsOtxtHzmFcc8CjORyLl8jcMmSQ TN7A== X-Gm-Message-State: AOAM530JUiO5JwdzrVFdGR/RYFR6wDXQ2tNsMZabse8iLkX4Qx5qxQul PK8G1fWeBwg9+9Ro+Gm9UY8ZvSIFEbwKf6S2Ty3Q9xOl7PSIbbjtRqKRkiwy3v/xbAl55YkMnmM ZLkSgPPEb4Qxt+FhwvC5XrAA= X-Received: by 2002:a5d:6da5:0:b0:1f1:f958:46fa with SMTP id u5-20020a5d6da5000000b001f1f95846famr3779335wrs.622.1646675127768; Mon, 07 Mar 2022 09:45:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyurCUYY5LH3jUmskIlDdoG/6dvqHZRp3se93Jg9nMuP2WZ6gFN7P0Tmj3tMmD4UkWNrBoMDg== X-Received: by 2002:a5d:6da5:0:b0:1f1:f958:46fa with SMTP id u5-20020a5d6da5000000b001f1f95846famr3779309wrs.622.1646675127527; Mon, 07 Mar 2022 09:45:27 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id l1-20020a05600c4f0100b00387369f380bsm14921267wmq.41.2022.03.07.09.45.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:45:26 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 08/14] module: Move kmemleak support to a separate file Date: Mon, 7 Mar 2022 17:45:03 +0000 Message-Id: <20220307174509.2887714-9-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. This patch migrates kmemleak code out of core module code into kernel/module/debug_kmemleak.c Reviewed-by: Christophe Leroy Signed-off-by: Aaron Tomlin --- kernel/module/Makefile | 1 + kernel/module/debug_kmemleak.c | 30 ++++++++++++++++++++++++++++++ kernel/module/internal.h | 7 +++++++ kernel/module/main.c | 27 --------------------------- 4 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 kernel/module/debug_kmemleak.c diff --git a/kernel/module/Makefile b/kernel/module/Makefile index d313c8472cb3..12388627725c 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -13,3 +13,4 @@ obj-$(CONFIG_MODULE_SIG) +=3D signing.o obj-$(CONFIG_LIVEPATCH) +=3D livepatch.o obj-$(CONFIG_MODULES_TREE_LOOKUP) +=3D tree_lookup.o obj-$(CONFIG_STRICT_MODULE_RWX) +=3D strict_rwx.o +obj-$(CONFIG_DEBUG_KMEMLEAK) +=3D debug_kmemleak.o diff --git a/kernel/module/debug_kmemleak.c b/kernel/module/debug_kmemleak.c new file mode 100644 index 000000000000..12a569d361e8 --- /dev/null +++ b/kernel/module/debug_kmemleak.c @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Module kmemleak support + * + * Copyright (C) 2009 Catalin Marinas + */ + +#include +#include +#include "internal.h" + +void kmemleak_load_module(const struct module *mod, + const struct load_info *info) +{ + unsigned int i; + + /* only scan the sections containing data */ + kmemleak_scan_area(mod, sizeof(struct module), GFP_KERNEL); + + for (i =3D 1; i < info->hdr->e_shnum; i++) { + /* Scan all writable sections that's not executable */ + if (!(info->sechdrs[i].sh_flags & SHF_ALLOC) || + !(info->sechdrs[i].sh_flags & SHF_WRITE) || + (info->sechdrs[i].sh_flags & SHF_EXECINSTR)) + continue; + + kmemleak_scan_area((void *)info->sechdrs[i].sh_addr, + info->sechdrs[i].sh_size, GFP_KERNEL); + } +} diff --git a/kernel/module/internal.h b/kernel/module/internal.h index d6f646a5da41..b0c360839f63 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -167,3 +167,10 @@ static inline int module_sig_check(struct load_info *i= nfo, int flags) return 0; } #endif /* !CONFIG_MODULE_SIG */ + +#ifdef CONFIG_DEBUG_KMEMLEAK +void kmemleak_load_module(const struct module *mod, const struct load_info= *info); +#else /* !CONFIG_DEBUG_KMEMLEAK */ +static inline void kmemleak_load_module(const struct module *mod, + const struct load_info *info) { } +#endif /* CONFIG_DEBUG_KMEMLEAK */ diff --git a/kernel/module/main.c b/kernel/module/main.c index c63e10c61694..7dd283959c5c 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2519,33 +2519,6 @@ bool __weak module_exit_section(const char *name) return strstarts(name, ".exit"); } =20 -#ifdef CONFIG_DEBUG_KMEMLEAK -static void kmemleak_load_module(const struct module *mod, - const struct load_info *info) -{ - unsigned int i; - - /* only scan the sections containing data */ - kmemleak_scan_area(mod, sizeof(struct module), GFP_KERNEL); - - for (i =3D 1; i < info->hdr->e_shnum; i++) { - /* Scan all writable sections that's not executable */ - if (!(info->sechdrs[i].sh_flags & SHF_ALLOC) || - !(info->sechdrs[i].sh_flags & SHF_WRITE) || - (info->sechdrs[i].sh_flags & SHF_EXECINSTR)) - continue; - - kmemleak_scan_area((void *)info->sechdrs[i].sh_addr, - info->sechdrs[i].sh_size, GFP_KERNEL); - } -} -#else -static inline void kmemleak_load_module(const struct module *mod, - const struct load_info *info) -{ -} -#endif - static int validate_section_offset(struct load_info *info, Elf_Shdr *shdr) { #if defined(CONFIG_64BIT) --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE6F1C433F5 for ; Mon, 7 Mar 2022 17:46:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243478AbiCGRq4 (ORCPT ); Mon, 7 Mar 2022 12:46:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244532AbiCGRqg (ORCPT ); Mon, 7 Mar 2022 12:46:36 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8FF69939F8 for ; Mon, 7 Mar 2022 09:45:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cZKsF3V2xKms5rUDdmplrUAEBHoN7M+YOs4uSrMcUTI=; b=bsAXhWb+6/ZnZKzdXt1F05Oiy47YHSsq5vp/Og8NtFhXvhIchfUCzhXgDWMkkas6m9xkgX gp8jcwXTmoUr0mtzhfkiJakkIT9qYy05j1ZIxi/Sk5VR2hXBra1c4bwQHIGlQ95UKiM8r8 gKwV19rqsCkquLDdSIOrBPkggHr+oLE= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-358-V1ZD1pP8Pqu8FEvS2h2B6g-1; Mon, 07 Mar 2022 12:45:32 -0500 X-MC-Unique: V1ZD1pP8Pqu8FEvS2h2B6g-1 Received: by mail-wm1-f71.google.com with SMTP id j42-20020a05600c1c2a00b00381febe402eso7716864wms.0 for ; Mon, 07 Mar 2022 09:45:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cZKsF3V2xKms5rUDdmplrUAEBHoN7M+YOs4uSrMcUTI=; b=4Y0V0xqH7Ffe09kucVFciiGsPWiB5zNtYzaUGG/IKId8UjGt2DtDusBcxr42IJIE8M b7gHU63NQVI3TWRfA8rAtsi1qantTKMMd6LLEPTZSw4PuPfrg8fszJvw/0MD/n43wAd5 H0Pw1vOuO/seWrrQB80W30VshzBEtAOsf/Q7jsbqBEsCH3ua40jbpSbH6YzH3RtOdDaq OZN4bn/hO3CrP2YWIL1HO0U9R8TLAgvZ+sMBdKcgYDlr0KKBiQlZGN4a1y57L1wdmOeD gm36zgmwh5+JiLwN9QyK9wBfhEelSvmAf7EWOmwrDe11RmBQYYdLb1+qPLSQAfSsBs51 co5Q== X-Gm-Message-State: AOAM532Lm9OTv792i1j2nAcwr9JTGgqUWJpOcrLOcdBqsoIHa/ybqG2V 55hFJbSDldDNFoVCnbzCS8GQzZ+l+NA7VUQlZppzlKVtsq0J7d3xheEUfbRkUMvtjf4tYGhh+A5 VnuUiEeO8bRPlpskBXoQLk2U= X-Received: by 2002:adf:e448:0:b0:1ea:c7b6:782 with SMTP id t8-20020adfe448000000b001eac7b60782mr9011227wrm.29.1646675130555; Mon, 07 Mar 2022 09:45:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpsW+q1yKYefziT+cptTKY89E8i4OkZA27D8O46y1Ep4HOTyUFEmopB3/AYf99t1MIjDUkIg== X-Received: by 2002:adf:e448:0:b0:1ea:c7b6:782 with SMTP id t8-20020adfe448000000b001eac7b60782mr9011199wrm.29.1646675130146; Mon, 07 Mar 2022 09:45:30 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id v10-20020a05600c214a00b00389bcc75559sm1277wml.27.2022.03.07.09.45.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:45:29 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 09/14] module: Move kallsyms support into a separate file Date: Mon, 7 Mar 2022 17:45:04 +0000 Message-Id: <20220307174509.2887714-10-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. This patch migrates kallsyms code out of core module code kernel/module/kallsyms.c Signed-off-by: Aaron Tomlin --- kernel/module/Makefile | 1 + kernel/module/internal.h | 29 +++ kernel/module/kallsyms.c | 502 ++++++++++++++++++++++++++++++++++++ kernel/module/main.c | 531 +-------------------------------------- 4 files changed, 538 insertions(+), 525 deletions(-) create mode 100644 kernel/module/kallsyms.c diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 12388627725c..9901bed3ab5b 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -14,3 +14,4 @@ obj-$(CONFIG_LIVEPATCH) +=3D livepatch.o obj-$(CONFIG_MODULES_TREE_LOOKUP) +=3D tree_lookup.o obj-$(CONFIG_STRICT_MODULE_RWX) +=3D strict_rwx.o obj-$(CONFIG_DEBUG_KMEMLEAK) +=3D debug_kmemleak.o +obj-$(CONFIG_KALLSYMS) +=3D kallsyms.o diff --git a/kernel/module/internal.h b/kernel/module/internal.h index b0c360839f63..44ca05b9eb8f 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -68,6 +68,19 @@ struct load_info { }; =20 int mod_verify_sig(const void *mod, struct load_info *info); +struct module *find_module_all(const char *name, size_t len, bool even_unf= ormed); +int cmp_name(const void *name, const void *sym); +long module_get_offset(struct module *mod, unsigned int *size, Elf_Shdr *s= echdr, + unsigned int section); + +static inline unsigned long kernel_symbol_value(const struct kernel_symbol= *sym) +{ +#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS + return (unsigned long)offset_to_ptr(&sym->value_offset); +#else + return sym->value; +#endif +} =20 #ifdef CONFIG_LIVEPATCH int copy_module_elf(struct module *mod, struct load_info *info); @@ -174,3 +187,19 @@ void kmemleak_load_module(const struct module *mod, co= nst struct load_info *info static inline void kmemleak_load_module(const struct module *mod, const struct load_info *info) { } #endif /* CONFIG_DEBUG_KMEMLEAK */ + +#ifdef CONFIG_KALLSYMS +void init_build_id(struct module *mod, const struct load_info *info); +void layout_symtab(struct module *mod, struct load_info *info); +void add_kallsyms(struct module *mod, const struct load_info *info); +unsigned long find_kallsyms_symbol_value(struct module *mod, const char *n= ame); + +static inline bool sect_empty(const Elf_Shdr *sect) +{ + return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size =3D=3D 0; +} +#else /* !CONFIG_KALLSYMS */ +static inline void init_build_id(struct module *mod, const struct load_inf= o *info) { } +static inline void layout_symtab(struct module *mod, struct load_info *inf= o) { } +static inline void add_kallsyms(struct module *mod, const struct load_info= *info) { } +#endif /* CONFIG_KALLSYMS */ diff --git a/kernel/module/kallsyms.c b/kernel/module/kallsyms.c new file mode 100644 index 000000000000..1b0780e20aab --- /dev/null +++ b/kernel/module/kallsyms.c @@ -0,0 +1,502 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Module kallsyms support + * + * Copyright (C) 2010 Rusty Russell + */ + +#include +#include +#include +#include +#include "internal.h" + +/* Lookup exported symbol in given range of kernel_symbols */ +static const struct kernel_symbol *lookup_exported_symbol(const char *name, + const struct kernel_symbol *start, + const struct kernel_symbol *stop) +{ + return bsearch(name, start, stop - start, + sizeof(struct kernel_symbol), cmp_name); +} + +static int is_exported(const char *name, unsigned long value, + const struct module *mod) +{ + const struct kernel_symbol *ks; + + if (!mod) + ks =3D lookup_exported_symbol(name, __start___ksymtab, __stop___ksymtab); + else + ks =3D lookup_exported_symbol(name, mod->syms, mod->syms + mod->num_syms= ); + + return ks && kernel_symbol_value(ks) =3D=3D value; +} + +/* As per nm */ +static char elf_type(const Elf_Sym *sym, const struct load_info *info) +{ + const Elf_Shdr *sechdrs =3D info->sechdrs; + + if (ELF_ST_BIND(sym->st_info) =3D=3D STB_WEAK) { + if (ELF_ST_TYPE(sym->st_info) =3D=3D STT_OBJECT) + return 'v'; + else + return 'w'; + } + if (sym->st_shndx =3D=3D SHN_UNDEF) + return 'U'; + if (sym->st_shndx =3D=3D SHN_ABS || sym->st_shndx =3D=3D info->index.pcpu) + return 'a'; + if (sym->st_shndx >=3D SHN_LORESERVE) + return '?'; + if (sechdrs[sym->st_shndx].sh_flags & SHF_EXECINSTR) + return 't'; + if (sechdrs[sym->st_shndx].sh_flags & SHF_ALLOC && + sechdrs[sym->st_shndx].sh_type !=3D SHT_NOBITS) { + if (!(sechdrs[sym->st_shndx].sh_flags & SHF_WRITE)) + return 'r'; + else if (sechdrs[sym->st_shndx].sh_flags & ARCH_SHF_SMALL) + return 'g'; + else + return 'd'; + } + if (sechdrs[sym->st_shndx].sh_type =3D=3D SHT_NOBITS) { + if (sechdrs[sym->st_shndx].sh_flags & ARCH_SHF_SMALL) + return 's'; + else + return 'b'; + } + if (strstarts(info->secstrings + sechdrs[sym->st_shndx].sh_name, + ".debug")) { + return 'n'; + } + return '?'; +} + +static bool is_core_symbol(const Elf_Sym *src, const Elf_Shdr *sechdrs, + unsigned int shnum, unsigned int pcpundx) +{ + const Elf_Shdr *sec; + + if (src->st_shndx =3D=3D SHN_UNDEF || + src->st_shndx >=3D shnum || + !src->st_name) + return false; + +#ifdef CONFIG_KALLSYMS_ALL + if (src->st_shndx =3D=3D pcpundx) + return true; +#endif + + sec =3D sechdrs + src->st_shndx; + if (!(sec->sh_flags & SHF_ALLOC) +#ifndef CONFIG_KALLSYMS_ALL + || !(sec->sh_flags & SHF_EXECINSTR) +#endif + || (sec->sh_entsize & INIT_OFFSET_MASK)) + return false; + + return true; +} + +/* + * We only allocate and copy the strings needed by the parts of symtab + * we keep. This is simple, but has the effect of making multiple + * copies of duplicates. We could be more sophisticated, see + * linux-kernel thread starting with + * <73defb5e4bca04a6431392cc341112b1@localhost>. + */ +void layout_symtab(struct module *mod, struct load_info *info) +{ + Elf_Shdr *symsect =3D info->sechdrs + info->index.sym; + Elf_Shdr *strsect =3D info->sechdrs + info->index.str; + const Elf_Sym *src; + unsigned int i, nsrc, ndst, strtab_size =3D 0; + + /* Put symbol section at end of init part of module. */ + symsect->sh_flags |=3D SHF_ALLOC; + symsect->sh_entsize =3D module_get_offset(mod, &mod->init_layout.size, sy= msect, + info->index.sym) | INIT_OFFSET_MASK; + pr_debug("\t%s\n", info->secstrings + symsect->sh_name); + + src =3D (void *)info->hdr + symsect->sh_offset; + nsrc =3D symsect->sh_size / sizeof(*src); + + /* Compute total space required for the core symbols' strtab. */ + for (ndst =3D i =3D 0; i < nsrc; i++) { + if (i =3D=3D 0 || is_livepatch_module(mod) || + is_core_symbol(src + i, info->sechdrs, info->hdr->e_shnum, + info->index.pcpu)) { + strtab_size +=3D strlen(&info->strtab[src[i].st_name]) + 1; + ndst++; + } + } + + /* Append room for core symbols at end of core part. */ + info->symoffs =3D ALIGN(mod->core_layout.size, symsect->sh_addralign ?: 1= ); + info->stroffs =3D mod->core_layout.size =3D info->symoffs + ndst * sizeof= (Elf_Sym); + mod->core_layout.size +=3D strtab_size; + info->core_typeoffs =3D mod->core_layout.size; + mod->core_layout.size +=3D ndst * sizeof(char); + mod->core_layout.size =3D debug_align(mod->core_layout.size); + + /* Put string table section at end of init part of module. */ + strsect->sh_flags |=3D SHF_ALLOC; + strsect->sh_entsize =3D module_get_offset(mod, &mod->init_layout.size, st= rsect, + info->index.str) | INIT_OFFSET_MASK; + pr_debug("\t%s\n", info->secstrings + strsect->sh_name); + + /* We'll tack temporary mod_kallsyms on the end. */ + mod->init_layout.size =3D ALIGN(mod->init_layout.size, + __alignof__(struct mod_kallsyms)); + info->mod_kallsyms_init_off =3D mod->init_layout.size; + mod->init_layout.size +=3D sizeof(struct mod_kallsyms); + info->init_typeoffs =3D mod->init_layout.size; + mod->init_layout.size +=3D nsrc * sizeof(char); + mod->init_layout.size =3D debug_align(mod->init_layout.size); +} + +/* + * We use the full symtab and strtab which layout_symtab arranged to + * be appended to the init section. Later we switch to the cut-down + * core-only ones. + */ +void add_kallsyms(struct module *mod, const struct load_info *info) +{ + unsigned int i, ndst; + const Elf_Sym *src; + Elf_Sym *dst; + char *s; + Elf_Shdr *symsec =3D &info->sechdrs[info->index.sym]; + + /* Set up to point into init section. */ + mod->kallsyms =3D mod->init_layout.base + info->mod_kallsyms_init_off; + + /* The following is safe since this pointer cannot change */ + mod->kallsyms->symtab =3D (void *)symsec->sh_addr; + mod->kallsyms->num_symtab =3D symsec->sh_size / sizeof(Elf_Sym); + /* Make sure we get permanent strtab: don't use info->strtab. */ + mod->kallsyms->strtab =3D (void *)info->sechdrs[info->index.str].sh_addr; + mod->kallsyms->typetab =3D mod->init_layout.base + info->init_typeoffs; + + /* + * Now populate the cut down core kallsyms for after init + * and set types up while we still have access to sections. + */ + mod->core_kallsyms.symtab =3D dst =3D mod->core_layout.base + info->symof= fs; + mod->core_kallsyms.strtab =3D s =3D mod->core_layout.base + info->stroffs; + mod->core_kallsyms.typetab =3D mod->core_layout.base + info->core_typeoff= s; + src =3D mod->kallsyms->symtab; + for (ndst =3D i =3D 0; i < mod->kallsyms->num_symtab; i++) { + mod->kallsyms->typetab[i] =3D elf_type(src + i, info); + if (i =3D=3D 0 || is_livepatch_module(mod) || + is_core_symbol(src + i, info->sechdrs, info->hdr->e_shnum, + info->index.pcpu)) { + mod->core_kallsyms.typetab[ndst] =3D + mod->kallsyms->typetab[i]; + dst[ndst] =3D src[i]; + dst[ndst++].st_name =3D s - mod->core_kallsyms.strtab; + s +=3D strscpy(s, &mod->kallsyms->strtab[src[i].st_name], + KSYM_NAME_LEN) + 1; + } + } + mod->core_kallsyms.num_symtab =3D ndst; +} + +#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) +void init_build_id(struct module *mod, const struct load_info *info) +{ + const Elf_Shdr *sechdr; + unsigned int i; + + for (i =3D 0; i < info->hdr->e_shnum; i++) { + sechdr =3D &info->sechdrs[i]; + if (!sect_empty(sechdr) && sechdr->sh_type =3D=3D SHT_NOTE && + !build_id_parse_buf((void *)sechdr->sh_addr, mod->build_id, + sechdr->sh_size)) + break; + } +} +#else +void init_build_id(struct module *mod, const struct load_info *info) +{ +} +#endif + +/* + * This ignores the intensely annoying "mapping symbols" found + * in ARM ELF files: $a, $t and $d. + */ +static inline int is_arm_mapping_symbol(const char *str) +{ + if (str[0] =3D=3D '.' && str[1] =3D=3D 'L') + return true; + return str[0] =3D=3D '$' && strchr("axtd", str[1]) && + (str[2] =3D=3D '\0' || str[2] =3D=3D '.'); +} + +static const char *kallsyms_symbol_name(struct mod_kallsyms *kallsyms, uns= igned int symnum) +{ + return kallsyms->strtab + kallsyms->symtab[symnum].st_name; +} + +/* + * Given a module and address, find the corresponding symbol and return it= s name + * while providing its size and offset if needed. + */ +static const char *find_kallsyms_symbol(struct module *mod, + unsigned long addr, + unsigned long *size, + unsigned long *offset) +{ + unsigned int i, best =3D 0; + unsigned long nextval, bestval; + struct mod_kallsyms *kallsyms =3D rcu_dereference_sched(mod->kallsyms); + + /* At worse, next value is at end of module */ + if (within_module_init(addr, mod)) + nextval =3D (unsigned long)mod->init_layout.base + mod->init_layout.text= _size; + else + nextval =3D (unsigned long)mod->core_layout.base + mod->core_layout.text= _size; + + bestval =3D kallsyms_symbol_value(&kallsyms->symtab[best]); + + /* + * Scan for closest preceding symbol, and next symbol. (ELF + * starts real symbols at 1). + */ + for (i =3D 1; i < kallsyms->num_symtab; i++) { + const Elf_Sym *sym =3D &kallsyms->symtab[i]; + unsigned long thisval =3D kallsyms_symbol_value(sym); + + if (sym->st_shndx =3D=3D SHN_UNDEF) + continue; + + /* + * We ignore unnamed symbols: they're uninformative + * and inserted at a whim. + */ + if (*kallsyms_symbol_name(kallsyms, i) =3D=3D '\0' || + is_arm_mapping_symbol(kallsyms_symbol_name(kallsyms, i))) + continue; + + if (thisval <=3D addr && thisval > bestval) { + best =3D i; + bestval =3D thisval; + } + if (thisval > addr && thisval < nextval) + nextval =3D thisval; + } + + if (!best) + return NULL; + + if (size) + *size =3D nextval - bestval; + if (offset) + *offset =3D addr - bestval; + + return kallsyms_symbol_name(kallsyms, best); +} + +void * __weak dereference_module_function_descriptor(struct module *mod, + void *ptr) +{ + return ptr; +} + +/* + * For kallsyms to ask for address resolution. NULL means not found. Car= eful + * not to lock to avoid deadlock on oopses, simply disable preemption. + */ +const char *module_address_lookup(unsigned long addr, + unsigned long *size, + unsigned long *offset, + char **modname, + const unsigned char **modbuildid, + char *namebuf) +{ + const char *ret =3D NULL; + struct module *mod; + + preempt_disable(); + mod =3D __module_address(addr); + if (mod) { + if (modname) + *modname =3D mod->name; + if (modbuildid) { +#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) + *modbuildid =3D mod->build_id; +#else + *modbuildid =3D NULL; +#endif + } + + ret =3D find_kallsyms_symbol(mod, addr, size, offset); + } + /* Make a copy in here where it's safe */ + if (ret) { + strncpy(namebuf, ret, KSYM_NAME_LEN - 1); + ret =3D namebuf; + } + preempt_enable(); + + return ret; +} + +int lookup_module_symbol_name(unsigned long addr, char *symname) +{ + struct module *mod; + + preempt_disable(); + list_for_each_entry_rcu(mod, &modules, list) { + if (mod->state =3D=3D MODULE_STATE_UNFORMED) + continue; + if (within_module(addr, mod)) { + const char *sym; + + sym =3D find_kallsyms_symbol(mod, addr, NULL, NULL); + if (!sym) + goto out; + + strscpy(symname, sym, KSYM_NAME_LEN); + preempt_enable(); + return 0; + } + } +out: + preempt_enable(); + return -ERANGE; +} + +int lookup_module_symbol_attrs(unsigned long addr, unsigned long *size, + unsigned long *offset, char *modname, char *name) +{ + struct module *mod; + + preempt_disable(); + list_for_each_entry_rcu(mod, &modules, list) { + if (mod->state =3D=3D MODULE_STATE_UNFORMED) + continue; + if (within_module(addr, mod)) { + const char *sym; + + sym =3D find_kallsyms_symbol(mod, addr, size, offset); + if (!sym) + goto out; + if (modname) + strscpy(modname, mod->name, MODULE_NAME_LEN); + if (name) + strscpy(name, sym, KSYM_NAME_LEN); + preempt_enable(); + return 0; + } + } +out: + preempt_enable(); + return -ERANGE; +} + +int module_get_kallsym(unsigned int symnum, unsigned long *value, char *ty= pe, + char *name, char *module_name, int *exported) +{ + struct module *mod; + + preempt_disable(); + list_for_each_entry_rcu(mod, &modules, list) { + struct mod_kallsyms *kallsyms; + + if (mod->state =3D=3D MODULE_STATE_UNFORMED) + continue; + kallsyms =3D rcu_dereference_sched(mod->kallsyms); + if (symnum < kallsyms->num_symtab) { + const Elf_Sym *sym =3D &kallsyms->symtab[symnum]; + + *value =3D kallsyms_symbol_value(sym); + *type =3D kallsyms->typetab[symnum]; + strscpy(name, kallsyms_symbol_name(kallsyms, symnum), KSYM_NAME_LEN); + strscpy(module_name, mod->name, MODULE_NAME_LEN); + *exported =3D is_exported(name, *value, mod); + preempt_enable(); + return 0; + } + symnum -=3D kallsyms->num_symtab; + } + preempt_enable(); + return -ERANGE; +} + +/* Given a module and name of symbol, find and return the symbol's value */ +unsigned long find_kallsyms_symbol_value(struct module *mod, const char *n= ame) +{ + unsigned int i; + struct mod_kallsyms *kallsyms =3D rcu_dereference_sched(mod->kallsyms); + + for (i =3D 0; i < kallsyms->num_symtab; i++) { + const Elf_Sym *sym =3D &kallsyms->symtab[i]; + + if (strcmp(name, kallsyms_symbol_name(kallsyms, i)) =3D=3D 0 && + sym->st_shndx !=3D SHN_UNDEF) + return kallsyms_symbol_value(sym); + } + return 0; +} + +/* Look for this name: can be of form module:name. */ +unsigned long module_kallsyms_lookup_name(const char *name) +{ + struct module *mod; + char *colon; + unsigned long ret =3D 0; + + /* Don't lock: we're in enough trouble already. */ + preempt_disable(); + if ((colon =3D strnchr(name, MODULE_NAME_LEN, ':')) !=3D NULL) { + if ((mod =3D find_module_all(name, colon - name, false)) !=3D NULL) + ret =3D find_kallsyms_symbol_value(mod, colon + 1); + } else { + list_for_each_entry_rcu(mod, &modules, list) { + if (mod->state =3D=3D MODULE_STATE_UNFORMED) + continue; + if ((ret =3D find_kallsyms_symbol_value(mod, name)) !=3D 0) + break; + } + } + preempt_enable(); + return ret; +} + +#ifdef CONFIG_LIVEPATCH +int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, + struct module *, unsigned long), + void *data) +{ + struct module *mod; + unsigned int i; + int ret =3D 0; + + mutex_lock(&module_mutex); + list_for_each_entry(mod, &modules, list) { + /* We hold module_mutex: no need for rcu_dereference_sched */ + struct mod_kallsyms *kallsyms =3D mod->kallsyms; + + if (mod->state =3D=3D MODULE_STATE_UNFORMED) + continue; + for (i =3D 0; i < kallsyms->num_symtab; i++) { + const Elf_Sym *sym =3D &kallsyms->symtab[i]; + + if (sym->st_shndx =3D=3D SHN_UNDEF) + continue; + + ret =3D fn(data, kallsyms_symbol_name(kallsyms, i), + mod, kallsyms_symbol_value(sym)); + if (ret !=3D 0) + goto out; + } + } +out: + mutex_unlock(&module_mutex); + return ret; +} +#endif /* CONFIG_LIVEPATCH */ diff --git a/kernel/module/main.c b/kernel/module/main.c index 7dd283959c5c..952079987ea4 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -288,15 +288,6 @@ static bool check_exported_symbol(const struct symsear= ch *syms, return true; } =20 -static unsigned long kernel_symbol_value(const struct kernel_symbol *sym) -{ -#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS - return (unsigned long)offset_to_ptr(&sym->value_offset); -#else - return sym->value; -#endif -} - static const char *kernel_symbol_name(const struct kernel_symbol *sym) { #ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS @@ -317,7 +308,7 @@ static const char *kernel_symbol_namespace(const struct= kernel_symbol *sym) #endif } =20 -static int cmp_name(const void *name, const void *sym) +int cmp_name(const void *name, const void *sym) { return strcmp(name, kernel_symbol_name(sym)); } @@ -387,8 +378,8 @@ static bool find_symbol(struct find_symbol_arg *fsa) * Search for module by name: must hold module_mutex (or preempt disabled * for read-only access). */ -static struct module *find_module_all(const char *name, size_t len, - bool even_unformed) +struct module *find_module_all(const char *name, size_t len, + bool even_unformed) { struct module *mod; =20 @@ -1294,13 +1285,6 @@ resolve_symbol_wait(struct module *mod, return ksym; } =20 -#ifdef CONFIG_KALLSYMS -static inline bool sect_empty(const Elf_Shdr *sect) -{ - return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size =3D=3D 0; -} -#endif - /* * /sys/module/foo/sections stuff * J. Corbet @@ -2065,7 +2049,7 @@ unsigned int __weak arch_mod_section_prepend(struct m= odule *mod, } =20 /* Update size with this section: return offset. */ -static long get_offset(struct module *mod, unsigned int *size, +long module_get_offset(struct module *mod, unsigned int *size, Elf_Shdr *sechdr, unsigned int section) { long ret; @@ -2121,7 +2105,7 @@ static void layout_sections(struct module *mod, struc= t load_info *info) || s->sh_entsize !=3D ~0UL || module_init_layout_section(sname)) continue; - s->sh_entsize =3D get_offset(mod, &mod->core_layout.size, s, i); + s->sh_entsize =3D module_get_offset(mod, &mod->core_layout.size, s, i); pr_debug("\t%s\n", sname); } switch (m) { @@ -2154,7 +2138,7 @@ static void layout_sections(struct module *mod, struc= t load_info *info) || s->sh_entsize !=3D ~0UL || !module_init_layout_section(sname)) continue; - s->sh_entsize =3D (get_offset(mod, &mod->init_layout.size, s, i) + s->sh_entsize =3D (module_get_offset(mod, &mod->init_layout.size, s, i) | INIT_OFFSET_MASK); pr_debug("\t%s\n", sname); } @@ -2267,228 +2251,6 @@ static void free_modinfo(struct module *mod) } } =20 -#ifdef CONFIG_KALLSYMS - -/* Lookup exported symbol in given range of kernel_symbols */ -static const struct kernel_symbol *lookup_exported_symbol(const char *name, - const struct kernel_symbol *start, - const struct kernel_symbol *stop) -{ - return bsearch(name, start, stop - start, - sizeof(struct kernel_symbol), cmp_name); -} - -static int is_exported(const char *name, unsigned long value, - const struct module *mod) -{ - const struct kernel_symbol *ks; - if (!mod) - ks =3D lookup_exported_symbol(name, __start___ksymtab, __stop___ksymtab); - else - ks =3D lookup_exported_symbol(name, mod->syms, mod->syms + mod->num_syms= ); - - return ks !=3D NULL && kernel_symbol_value(ks) =3D=3D value; -} - -/* As per nm */ -static char elf_type(const Elf_Sym *sym, const struct load_info *info) -{ - const Elf_Shdr *sechdrs =3D info->sechdrs; - - if (ELF_ST_BIND(sym->st_info) =3D=3D STB_WEAK) { - if (ELF_ST_TYPE(sym->st_info) =3D=3D STT_OBJECT) - return 'v'; - else - return 'w'; - } - if (sym->st_shndx =3D=3D SHN_UNDEF) - return 'U'; - if (sym->st_shndx =3D=3D SHN_ABS || sym->st_shndx =3D=3D info->index.pcpu) - return 'a'; - if (sym->st_shndx >=3D SHN_LORESERVE) - return '?'; - if (sechdrs[sym->st_shndx].sh_flags & SHF_EXECINSTR) - return 't'; - if (sechdrs[sym->st_shndx].sh_flags & SHF_ALLOC - && sechdrs[sym->st_shndx].sh_type !=3D SHT_NOBITS) { - if (!(sechdrs[sym->st_shndx].sh_flags & SHF_WRITE)) - return 'r'; - else if (sechdrs[sym->st_shndx].sh_flags & ARCH_SHF_SMALL) - return 'g'; - else - return 'd'; - } - if (sechdrs[sym->st_shndx].sh_type =3D=3D SHT_NOBITS) { - if (sechdrs[sym->st_shndx].sh_flags & ARCH_SHF_SMALL) - return 's'; - else - return 'b'; - } - if (strstarts(info->secstrings + sechdrs[sym->st_shndx].sh_name, - ".debug")) { - return 'n'; - } - return '?'; -} - -static bool is_core_symbol(const Elf_Sym *src, const Elf_Shdr *sechdrs, - unsigned int shnum, unsigned int pcpundx) -{ - const Elf_Shdr *sec; - - if (src->st_shndx =3D=3D SHN_UNDEF - || src->st_shndx >=3D shnum - || !src->st_name) - return false; - -#ifdef CONFIG_KALLSYMS_ALL - if (src->st_shndx =3D=3D pcpundx) - return true; -#endif - - sec =3D sechdrs + src->st_shndx; - if (!(sec->sh_flags & SHF_ALLOC) -#ifndef CONFIG_KALLSYMS_ALL - || !(sec->sh_flags & SHF_EXECINSTR) -#endif - || (sec->sh_entsize & INIT_OFFSET_MASK)) - return false; - - return true; -} - -/* - * We only allocate and copy the strings needed by the parts of symtab - * we keep. This is simple, but has the effect of making multiple - * copies of duplicates. We could be more sophisticated, see - * linux-kernel thread starting with - * <73defb5e4bca04a6431392cc341112b1@localhost>. - */ -static void layout_symtab(struct module *mod, struct load_info *info) -{ - Elf_Shdr *symsect =3D info->sechdrs + info->index.sym; - Elf_Shdr *strsect =3D info->sechdrs + info->index.str; - const Elf_Sym *src; - unsigned int i, nsrc, ndst, strtab_size =3D 0; - - /* Put symbol section at end of init part of module. */ - symsect->sh_flags |=3D SHF_ALLOC; - symsect->sh_entsize =3D get_offset(mod, &mod->init_layout.size, symsect, - info->index.sym) | INIT_OFFSET_MASK; - pr_debug("\t%s\n", info->secstrings + symsect->sh_name); - - src =3D (void *)info->hdr + symsect->sh_offset; - nsrc =3D symsect->sh_size / sizeof(*src); - - /* Compute total space required for the core symbols' strtab. */ - for (ndst =3D i =3D 0; i < nsrc; i++) { - if (i =3D=3D 0 || is_livepatch_module(mod) || - is_core_symbol(src+i, info->sechdrs, info->hdr->e_shnum, - info->index.pcpu)) { - strtab_size +=3D strlen(&info->strtab[src[i].st_name])+1; - ndst++; - } - } - - /* Append room for core symbols at end of core part. */ - info->symoffs =3D ALIGN(mod->core_layout.size, symsect->sh_addralign ?: 1= ); - info->stroffs =3D mod->core_layout.size =3D info->symoffs + ndst * sizeof= (Elf_Sym); - mod->core_layout.size +=3D strtab_size; - info->core_typeoffs =3D mod->core_layout.size; - mod->core_layout.size +=3D ndst * sizeof(char); - mod->core_layout.size =3D debug_align(mod->core_layout.size); - - /* Put string table section at end of init part of module. */ - strsect->sh_flags |=3D SHF_ALLOC; - strsect->sh_entsize =3D get_offset(mod, &mod->init_layout.size, strsect, - info->index.str) | INIT_OFFSET_MASK; - pr_debug("\t%s\n", info->secstrings + strsect->sh_name); - - /* We'll tack temporary mod_kallsyms on the end. */ - mod->init_layout.size =3D ALIGN(mod->init_layout.size, - __alignof__(struct mod_kallsyms)); - info->mod_kallsyms_init_off =3D mod->init_layout.size; - mod->init_layout.size +=3D sizeof(struct mod_kallsyms); - info->init_typeoffs =3D mod->init_layout.size; - mod->init_layout.size +=3D nsrc * sizeof(char); - mod->init_layout.size =3D debug_align(mod->init_layout.size); -} - -/* - * We use the full symtab and strtab which layout_symtab arranged to - * be appended to the init section. Later we switch to the cut-down - * core-only ones. - */ -static void add_kallsyms(struct module *mod, const struct load_info *info) -{ - unsigned int i, ndst; - const Elf_Sym *src; - Elf_Sym *dst; - char *s; - Elf_Shdr *symsec =3D &info->sechdrs[info->index.sym]; - - /* Set up to point into init section. */ - mod->kallsyms =3D mod->init_layout.base + info->mod_kallsyms_init_off; - - mod->kallsyms->symtab =3D (void *)symsec->sh_addr; - mod->kallsyms->num_symtab =3D symsec->sh_size / sizeof(Elf_Sym); - /* Make sure we get permanent strtab: don't use info->strtab. */ - mod->kallsyms->strtab =3D (void *)info->sechdrs[info->index.str].sh_addr; - mod->kallsyms->typetab =3D mod->init_layout.base + info->init_typeoffs; - - /* - * Now populate the cut down core kallsyms for after init - * and set types up while we still have access to sections. - */ - mod->core_kallsyms.symtab =3D dst =3D mod->core_layout.base + info->symof= fs; - mod->core_kallsyms.strtab =3D s =3D mod->core_layout.base + info->stroffs; - mod->core_kallsyms.typetab =3D mod->core_layout.base + info->core_typeoff= s; - src =3D mod->kallsyms->symtab; - for (ndst =3D i =3D 0; i < mod->kallsyms->num_symtab; i++) { - mod->kallsyms->typetab[i] =3D elf_type(src + i, info); - if (i =3D=3D 0 || is_livepatch_module(mod) || - is_core_symbol(src+i, info->sechdrs, info->hdr->e_shnum, - info->index.pcpu)) { - mod->core_kallsyms.typetab[ndst] =3D - mod->kallsyms->typetab[i]; - dst[ndst] =3D src[i]; - dst[ndst++].st_name =3D s - mod->core_kallsyms.strtab; - s +=3D strlcpy(s, &mod->kallsyms->strtab[src[i].st_name], - KSYM_NAME_LEN) + 1; - } - } - mod->core_kallsyms.num_symtab =3D ndst; -} -#else -static inline void layout_symtab(struct module *mod, struct load_info *inf= o) -{ -} - -static void add_kallsyms(struct module *mod, const struct load_info *info) -{ -} -#endif /* CONFIG_KALLSYMS */ - -#if IS_ENABLED(CONFIG_KALLSYMS) && IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) -static void init_build_id(struct module *mod, const struct load_info *info) -{ - const Elf_Shdr *sechdr; - unsigned int i; - - for (i =3D 0; i < info->hdr->e_shnum; i++) { - sechdr =3D &info->sechdrs[i]; - if (!sect_empty(sechdr) && sechdr->sh_type =3D=3D SHT_NOTE && - !build_id_parse_buf((void *)sechdr->sh_addr, mod->build_id, - sechdr->sh_size)) - break; - } -} -#else -static void init_build_id(struct module *mod, const struct load_info *info) -{ -} -#endif - static void dynamic_debug_setup(struct module *mod, struct _ddebug *debug,= unsigned int num) { if (!debug) @@ -3799,287 +3561,6 @@ static inline int within(unsigned long addr, void *= start, unsigned long size) return ((void *)addr >=3D start && (void *)addr < start + size); } =20 -#ifdef CONFIG_KALLSYMS -/* - * This ignores the intensely annoying "mapping symbols" found - * in ARM ELF files: $a, $t and $d. - */ -static inline int is_arm_mapping_symbol(const char *str) -{ - if (str[0] =3D=3D '.' && str[1] =3D=3D 'L') - return true; - return str[0] =3D=3D '$' && strchr("axtd", str[1]) - && (str[2] =3D=3D '\0' || str[2] =3D=3D '.'); -} - -static const char *kallsyms_symbol_name(struct mod_kallsyms *kallsyms, uns= igned int symnum) -{ - return kallsyms->strtab + kallsyms->symtab[symnum].st_name; -} - -/* - * Given a module and address, find the corresponding symbol and return it= s name - * while providing its size and offset if needed. - */ -static const char *find_kallsyms_symbol(struct module *mod, - unsigned long addr, - unsigned long *size, - unsigned long *offset) -{ - unsigned int i, best =3D 0; - unsigned long nextval, bestval; - struct mod_kallsyms *kallsyms =3D rcu_dereference_sched(mod->kallsyms); - - /* At worse, next value is at end of module */ - if (within_module_init(addr, mod)) - nextval =3D (unsigned long)mod->init_layout.base+mod->init_layout.text_s= ize; - else - nextval =3D (unsigned long)mod->core_layout.base+mod->core_layout.text_s= ize; - - bestval =3D kallsyms_symbol_value(&kallsyms->symtab[best]); - - /* - * Scan for closest preceding symbol, and next symbol. (ELF - * starts real symbols at 1). - */ - for (i =3D 1; i < kallsyms->num_symtab; i++) { - const Elf_Sym *sym =3D &kallsyms->symtab[i]; - unsigned long thisval =3D kallsyms_symbol_value(sym); - - if (sym->st_shndx =3D=3D SHN_UNDEF) - continue; - - /* - * We ignore unnamed symbols: they're uninformative - * and inserted at a whim. - */ - if (*kallsyms_symbol_name(kallsyms, i) =3D=3D '\0' - || is_arm_mapping_symbol(kallsyms_symbol_name(kallsyms, i))) - continue; - - if (thisval <=3D addr && thisval > bestval) { - best =3D i; - bestval =3D thisval; - } - if (thisval > addr && thisval < nextval) - nextval =3D thisval; - } - - if (!best) - return NULL; - - if (size) - *size =3D nextval - bestval; - if (offset) - *offset =3D addr - bestval; - - return kallsyms_symbol_name(kallsyms, best); -} - -void * __weak dereference_module_function_descriptor(struct module *mod, - void *ptr) -{ - return ptr; -} - -/* - * For kallsyms to ask for address resolution. NULL means not found. Car= eful - * not to lock to avoid deadlock on oopses, simply disable preemption. - */ -const char *module_address_lookup(unsigned long addr, - unsigned long *size, - unsigned long *offset, - char **modname, - const unsigned char **modbuildid, - char *namebuf) -{ - const char *ret =3D NULL; - struct module *mod; - - preempt_disable(); - mod =3D __module_address(addr); - if (mod) { - if (modname) - *modname =3D mod->name; - if (modbuildid) { -#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) - *modbuildid =3D mod->build_id; -#else - *modbuildid =3D NULL; -#endif - } - - ret =3D find_kallsyms_symbol(mod, addr, size, offset); - } - /* Make a copy in here where it's safe */ - if (ret) { - strncpy(namebuf, ret, KSYM_NAME_LEN - 1); - ret =3D namebuf; - } - preempt_enable(); - - return ret; -} - -int lookup_module_symbol_name(unsigned long addr, char *symname) -{ - struct module *mod; - - preempt_disable(); - list_for_each_entry_rcu(mod, &modules, list) { - if (mod->state =3D=3D MODULE_STATE_UNFORMED) - continue; - if (within_module(addr, mod)) { - const char *sym; - - sym =3D find_kallsyms_symbol(mod, addr, NULL, NULL); - if (!sym) - goto out; - - strlcpy(symname, sym, KSYM_NAME_LEN); - preempt_enable(); - return 0; - } - } -out: - preempt_enable(); - return -ERANGE; -} - -int lookup_module_symbol_attrs(unsigned long addr, unsigned long *size, - unsigned long *offset, char *modname, char *name) -{ - struct module *mod; - - preempt_disable(); - list_for_each_entry_rcu(mod, &modules, list) { - if (mod->state =3D=3D MODULE_STATE_UNFORMED) - continue; - if (within_module(addr, mod)) { - const char *sym; - - sym =3D find_kallsyms_symbol(mod, addr, size, offset); - if (!sym) - goto out; - if (modname) - strlcpy(modname, mod->name, MODULE_NAME_LEN); - if (name) - strlcpy(name, sym, KSYM_NAME_LEN); - preempt_enable(); - return 0; - } - } -out: - preempt_enable(); - return -ERANGE; -} - -int module_get_kallsym(unsigned int symnum, unsigned long *value, char *ty= pe, - char *name, char *module_name, int *exported) -{ - struct module *mod; - - preempt_disable(); - list_for_each_entry_rcu(mod, &modules, list) { - struct mod_kallsyms *kallsyms; - - if (mod->state =3D=3D MODULE_STATE_UNFORMED) - continue; - kallsyms =3D rcu_dereference_sched(mod->kallsyms); - if (symnum < kallsyms->num_symtab) { - const Elf_Sym *sym =3D &kallsyms->symtab[symnum]; - - *value =3D kallsyms_symbol_value(sym); - *type =3D kallsyms->typetab[symnum]; - strlcpy(name, kallsyms_symbol_name(kallsyms, symnum), KSYM_NAME_LEN); - strlcpy(module_name, mod->name, MODULE_NAME_LEN); - *exported =3D is_exported(name, *value, mod); - preempt_enable(); - return 0; - } - symnum -=3D kallsyms->num_symtab; - } - preempt_enable(); - return -ERANGE; -} - -/* Given a module and name of symbol, find and return the symbol's value */ -static unsigned long find_kallsyms_symbol_value(struct module *mod, const = char *name) -{ - unsigned int i; - struct mod_kallsyms *kallsyms =3D rcu_dereference_sched(mod->kallsyms); - - for (i =3D 0; i < kallsyms->num_symtab; i++) { - const Elf_Sym *sym =3D &kallsyms->symtab[i]; - - if (strcmp(name, kallsyms_symbol_name(kallsyms, i)) =3D=3D 0 && - sym->st_shndx !=3D SHN_UNDEF) - return kallsyms_symbol_value(sym); - } - return 0; -} - -/* Look for this name: can be of form module:name. */ -unsigned long module_kallsyms_lookup_name(const char *name) -{ - struct module *mod; - char *colon; - unsigned long ret =3D 0; - - /* Don't lock: we're in enough trouble already. */ - preempt_disable(); - if ((colon =3D strnchr(name, MODULE_NAME_LEN, ':')) !=3D NULL) { - if ((mod =3D find_module_all(name, colon - name, false)) !=3D NULL) - ret =3D find_kallsyms_symbol_value(mod, colon+1); - } else { - list_for_each_entry_rcu(mod, &modules, list) { - if (mod->state =3D=3D MODULE_STATE_UNFORMED) - continue; - if ((ret =3D find_kallsyms_symbol_value(mod, name)) !=3D 0) - break; - } - } - preempt_enable(); - return ret; -} - -#ifdef CONFIG_LIVEPATCH -int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, - struct module *, unsigned long), - void *data) -{ - struct module *mod; - unsigned int i; - int ret =3D 0; - - mutex_lock(&module_mutex); - list_for_each_entry(mod, &modules, list) { - /* We hold module_mutex: no need for rcu_dereference_sched */ - struct mod_kallsyms *kallsyms =3D mod->kallsyms; - - if (mod->state =3D=3D MODULE_STATE_UNFORMED) - continue; - for (i =3D 0; i < kallsyms->num_symtab; i++) { - const Elf_Sym *sym =3D &kallsyms->symtab[i]; - - if (sym->st_shndx =3D=3D SHN_UNDEF) - continue; - - ret =3D fn(data, kallsyms_symbol_name(kallsyms, i), - mod, kallsyms_symbol_value(sym)); - if (ret !=3D 0) - goto out; - - cond_resched(); - } - } -out: - mutex_unlock(&module_mutex); - return ret; -} -#endif /* CONFIG_LIVEPATCH */ -#endif /* CONFIG_KALLSYMS */ - static void cfi_init(struct module *mod) { #ifdef CONFIG_CFI_CLANG --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9808DC433EF for ; Mon, 7 Mar 2022 17:46:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244577AbiCGRq7 (ORCPT ); Mon, 7 Mar 2022 12:46:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244505AbiCGRqg (ORCPT ); Mon, 7 Mar 2022 12:46:36 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2F8D8939FF for ; Mon, 7 Mar 2022 09:45:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nlcVw0WJ8YWnydchI7778Sj1W6AqsxSBROpPSypOfl0=; b=WqHsWzqMSAeOi9cPPZrlRCquRMUyvjUwG5nuegtmHh5IRSjj3+II+fLf4W+x+1hwScqP9Z JnT1qHCYYS+V0QsA6t/rJdZWfgAfQVOJKRR6cOTMtNMVZL1EvliIZjSzvRu0Vl39B1qRXq yxv9im+dZeLjIEF+AcvqWPyP05rZyNE= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-440-DEvj8thNPSabSMgkj99MPA-1; Mon, 07 Mar 2022 12:45:33 -0500 X-MC-Unique: DEvj8thNPSabSMgkj99MPA-1 Received: by mail-wr1-f71.google.com with SMTP id o9-20020adfca09000000b001ea79f7edf8so4810173wrh.16 for ; Mon, 07 Mar 2022 09:45:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nlcVw0WJ8YWnydchI7778Sj1W6AqsxSBROpPSypOfl0=; b=jMdSxac94WWZJc4jnpPZtqSPH0JMBjWWusZ3Xzn0GosLkY32I6hZth9R5oX1fSuFKx ZI9hPnxpLfvuuXANAEqWC7HCVRGoe7W/OgI/GE85eP5Z5f8o3mbyUQmgXW2+l4xK+VZ/ d5Cbt0icDudIxXQguKLJ4pvFhTkxSKUM8I4HBhjNGgETN8Ocn+N8iwok5JAS2IRV3X6u 5hyco8pfVS/lSDEw6J9d54BaAbTfCeXF1eeFGqrR+HK5FuekKz86D6kUjXX4tIJdKNR7 Z5nU0jLA0gNBrI28hYeKd6dhwxob10X3awZ3OZgCeY0OpIzRJFxffaJ571/WrtcS6Wdi 55uw== X-Gm-Message-State: AOAM531IA2MRnzoVPjW6yMLefaJxVpIqbXJUKgvrZzjoXeAJokLurSgK xVJKJHZBb66+z5wM2Cp5h385drgCEiVwh8X6uSjKv++9UTXowB6hxfpkinR4B7/GFZqJlMCdUgE z8o5IA6MuPBcKXxSogbhUPwQ= X-Received: by 2002:adf:e50a:0:b0:1f0:224e:fd6f with SMTP id j10-20020adfe50a000000b001f0224efd6fmr9147898wrm.209.1646675131940; Mon, 07 Mar 2022 09:45:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJyqt7/tblgvqyApiOFuIbVv/e/Pm1i0tYOXmpyi0jdNPGvBzFGoQ+HCrkVXFT+QeBgBJaAlcg== X-Received: by 2002:adf:e50a:0:b0:1f0:224e:fd6f with SMTP id j10-20020adfe50a000000b001f0224efd6fmr9147883wrm.209.1646675131749; Mon, 07 Mar 2022 09:45:31 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id f8-20020adfb608000000b0020229d72a4esm567342wre.38.2022.03.07.09.45.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:45:31 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 10/14] module: kallsyms: Fix suspicious rcu usage Date: Mon, 7 Mar 2022 17:45:05 +0000 Message-Id: <20220307174509.2887714-11-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. The purpose of this patch is to address the various Sparse warnings due to the incorrect dereference/or access of an __rcu pointer. Signed-off-by: Aaron Tomlin --- kernel/module/kallsyms.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/kernel/module/kallsyms.c b/kernel/module/kallsyms.c index 1b0780e20aab..a3da0686a2a6 100644 --- a/kernel/module/kallsyms.c +++ b/kernel/module/kallsyms.c @@ -171,14 +171,17 @@ void add_kallsyms(struct module *mod, const struct lo= ad_info *info) Elf_Shdr *symsec =3D &info->sechdrs[info->index.sym]; =20 /* Set up to point into init section. */ - mod->kallsyms =3D mod->init_layout.base + info->mod_kallsyms_init_off; + mod->kallsyms =3D (void __rcu *)mod->init_layout.base + + info->mod_kallsyms_init_off; =20 + preempt_disable(); /* The following is safe since this pointer cannot change */ - mod->kallsyms->symtab =3D (void *)symsec->sh_addr; - mod->kallsyms->num_symtab =3D symsec->sh_size / sizeof(Elf_Sym); + rcu_dereference_sched(mod->kallsyms)->symtab =3D (void *)symsec->sh_addr; + rcu_dereference_sched(mod->kallsyms)->num_symtab =3D symsec->sh_size / si= zeof(Elf_Sym); /* Make sure we get permanent strtab: don't use info->strtab. */ - mod->kallsyms->strtab =3D (void *)info->sechdrs[info->index.str].sh_addr; - mod->kallsyms->typetab =3D mod->init_layout.base + info->init_typeoffs; + rcu_dereference_sched(mod->kallsyms)->strtab =3D + (void *)info->sechdrs[info->index.str].sh_addr; + rcu_dereference_sched(mod->kallsyms)->typetab =3D mod->init_layout.base += info->init_typeoffs; =20 /* * Now populate the cut down core kallsyms for after init @@ -187,20 +190,22 @@ void add_kallsyms(struct module *mod, const struct lo= ad_info *info) mod->core_kallsyms.symtab =3D dst =3D mod->core_layout.base + info->symof= fs; mod->core_kallsyms.strtab =3D s =3D mod->core_layout.base + info->stroffs; mod->core_kallsyms.typetab =3D mod->core_layout.base + info->core_typeoff= s; - src =3D mod->kallsyms->symtab; - for (ndst =3D i =3D 0; i < mod->kallsyms->num_symtab; i++) { - mod->kallsyms->typetab[i] =3D elf_type(src + i, info); + src =3D rcu_dereference_sched(mod->kallsyms)->symtab; + for (ndst =3D i =3D 0; i < rcu_dereference_sched(mod->kallsyms)->num_symt= ab; i++) { + rcu_dereference_sched(mod->kallsyms)->typetab[i] =3D elf_type(src + i, i= nfo); if (i =3D=3D 0 || is_livepatch_module(mod) || is_core_symbol(src + i, info->sechdrs, info->hdr->e_shnum, info->index.pcpu)) { mod->core_kallsyms.typetab[ndst] =3D - mod->kallsyms->typetab[i]; + rcu_dereference_sched(mod->kallsyms)->typetab[i]; dst[ndst] =3D src[i]; dst[ndst++].st_name =3D s - mod->core_kallsyms.strtab; - s +=3D strscpy(s, &mod->kallsyms->strtab[src[i].st_name], + s +=3D strscpy(s, + &rcu_dereference_sched(mod->kallsyms)->strtab[src[i].st_name], KSYM_NAME_LEN) + 1; } } + preempt_enable(); mod->core_kallsyms.num_symtab =3D ndst; } =20 @@ -478,11 +483,16 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, = const char *, =20 mutex_lock(&module_mutex); list_for_each_entry(mod, &modules, list) { - /* We hold module_mutex: no need for rcu_dereference_sched */ - struct mod_kallsyms *kallsyms =3D mod->kallsyms; + struct mod_kallsyms *kallsyms; =20 if (mod->state =3D=3D MODULE_STATE_UNFORMED) continue; + + /* Use rcu_dereference_sched() to remain compliant with the sparse tool = */ + preempt_disable(); + kallsyms =3D rcu_dereference_sched(mod->kallsyms); + preempt_enable(); + for (i =3D 0; i < kallsyms->num_symtab; i++) { const Elf_Sym *sym =3D &kallsyms->symtab[i]; =20 --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35E6DC433FE for ; Mon, 7 Mar 2022 17:45:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244564AbiCGRqu (ORCPT ); Mon, 7 Mar 2022 12:46:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244546AbiCGRqi (ORCPT ); Mon, 7 Mar 2022 12:46:38 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 13B419549E for ; Mon, 7 Mar 2022 09:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t51dSs9d9mDJR5zHj4NgMBJ6gQxLMRrjvZ9uJ9INxC4=; b=NE7FGyB3BBZAoKWMqmh7rKl/qln8nLn3UBsJyzSLnA/V89e8TBrSm0vdjoWIiSGFe80atz +2gP2gJvDCD67ieM2+ifcEf4EwE60X4pjnL+dI0e18RoHlh6uXarmjjvVw6MO1gC/ArTKM sbR4SCwyqqWPVBzAKSpSfmnbgfhWqr8= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-31-hpFxNlXANzu8yxtXoHRi5w-1; Mon, 07 Mar 2022 12:45:36 -0500 X-MC-Unique: hpFxNlXANzu8yxtXoHRi5w-1 Received: by mail-wm1-f70.google.com with SMTP id 3-20020a05600c230300b00384e15ceae4so6695482wmo.7 for ; Mon, 07 Mar 2022 09:45:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t51dSs9d9mDJR5zHj4NgMBJ6gQxLMRrjvZ9uJ9INxC4=; b=XWJodhDxRb37kbDL3t6jhXlxJ1j4V7M9GJQiYNw9g/vBqUmCzi9IEkvtsyDTMOPjtG EfHM1QEyW5zAnIpCQJbYOpZ54xKDmlj3zrQak9jpuut+xcZ3+WJk1o3gki9aNW1wMpGW zprQRTdXbRKwgKz9w8rXz8uqStBRQSNPCz79Rmc8HL3959ICigHWLh3eNxcWN0LYQJD5 m6j8AS9PM0evFrmyV0WnjwTILA8ZK6EKHUFxHE/BfIfab5kjaHZVEPU/7OnmuXJ5j8IU XEPI/VrQZ7FUopKGubCAOvulfV5qm2YALoxSC/KSnVy7FZ7tB1nGHQ0vKgPq+DmgOMP8 dlgQ== X-Gm-Message-State: AOAM533Xt0sJAv4bf11wL0D8bzzlYBqzHxSFWZMD4R9IarBkQ34v+qHK iLZN8NUR+E2aHiNkfD1dcjwnqS0pPsNDa62srcSHwYjifwezFe1idNJwLW2aQeYcyfu1lWml7KH Ir7OFud018a9DsKXq0Y+gvsc= X-Received: by 2002:adf:a199:0:b0:1f0:20f5:8f79 with SMTP id u25-20020adfa199000000b001f020f58f79mr8828985wru.296.1646675133728; Mon, 07 Mar 2022 09:45:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJyT7JNm8gY9Di2X0ytG5O26Fg7ODMOtWbn1PktMV3kcOZmv5N/38oELXfi+A/eOrlhkeMHW5g== X-Received: by 2002:adf:a199:0:b0:1f0:20f5:8f79 with SMTP id u25-20020adfa199000000b001f020f58f79mr8828961wru.296.1646675133463; Mon, 07 Mar 2022 09:45:33 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id h17-20020a05600c351100b00381807bd920sm557wmq.28.2022.03.07.09.45.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:45:32 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 11/14] module: Move procfs support into a separate file Date: Mon, 7 Mar 2022 17:45:06 +0000 Message-Id: <20220307174509.2887714-12-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. This patch migrates code that allows one to generate a list of loaded/or linked modules via /proc when procfs support is enabled into kernel/module/procfs.c. Reviewed-by: Christophe Leroy Signed-off-by: Aaron Tomlin --- kernel/module/Makefile | 1 + kernel/module/internal.h | 1 + kernel/module/main.c | 131 +----------------------------------- kernel/module/procfs.c | 142 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 130 deletions(-) create mode 100644 kernel/module/procfs.c diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 9901bed3ab5b..94296c98a67f 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -15,3 +15,4 @@ obj-$(CONFIG_MODULES_TREE_LOOKUP) +=3D tree_lookup.o obj-$(CONFIG_STRICT_MODULE_RWX) +=3D strict_rwx.o obj-$(CONFIG_DEBUG_KMEMLEAK) +=3D debug_kmemleak.o obj-$(CONFIG_KALLSYMS) +=3D kallsyms.o +obj-$(CONFIG_PROC_FS) +=3D procfs.o diff --git a/kernel/module/internal.h b/kernel/module/internal.h index 44ca05b9eb8f..6af40c2d145f 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -72,6 +72,7 @@ struct module *find_module_all(const char *name, size_t l= en, bool even_unformed) int cmp_name(const void *name, const void *sym); long module_get_offset(struct module *mod, unsigned int *size, Elf_Shdr *s= echdr, unsigned int section); +char *module_flags(struct module *mod, char *buf); =20 static inline unsigned long kernel_symbol_value(const struct kernel_symbol= *sym) { diff --git a/kernel/module/main.c b/kernel/module/main.c index 952079987ea4..44b6fd1acc44 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -805,31 +804,6 @@ SYSCALL_DEFINE2(delete_module, const char __user *, na= me_user, return ret; } =20 -static inline void print_unload_info(struct seq_file *m, struct module *mo= d) -{ - struct module_use *use; - int printed_something =3D 0; - - seq_printf(m, " %i ", module_refcount(mod)); - - /* - * Always include a trailing , so userspace can differentiate - * between this and the old multi-field proc format. - */ - list_for_each_entry(use, &mod->source_list, source_list) { - printed_something =3D 1; - seq_printf(m, "%s,", use->source->name); - } - - if (mod->init !=3D NULL && mod->exit =3D=3D NULL) { - printed_something =3D 1; - seq_puts(m, "[permanent],"); - } - - if (!printed_something) - seq_puts(m, "-"); -} - void __symbol_put(const char *symbol) { struct find_symbol_arg fsa =3D { @@ -919,12 +893,6 @@ void module_put(struct module *module) EXPORT_SYMBOL(module_put); =20 #else /* !CONFIG_MODULE_UNLOAD */ -static inline void print_unload_info(struct seq_file *m, struct module *mo= d) -{ - /* We don't know the usage count, or what modules are using. */ - seq_puts(m, " - -"); -} - static inline void module_unload_free(struct module *mod) { } @@ -3596,7 +3564,7 @@ static void cfi_cleanup(struct module *mod) } =20 /* Keep in sync with MODULE_FLAGS_BUF_SIZE !!! */ -static char *module_flags(struct module *mod, char *buf) +char *module_flags(struct module *mod, char *buf) { int bx =3D 0; =20 @@ -3619,103 +3587,6 @@ static char *module_flags(struct module *mod, char = *buf) return buf; } =20 -#ifdef CONFIG_PROC_FS -/* Called by the /proc file system to return a list of modules. */ -static void *m_start(struct seq_file *m, loff_t *pos) -{ - mutex_lock(&module_mutex); - return seq_list_start(&modules, *pos); -} - -static void *m_next(struct seq_file *m, void *p, loff_t *pos) -{ - return seq_list_next(p, &modules, pos); -} - -static void m_stop(struct seq_file *m, void *p) -{ - mutex_unlock(&module_mutex); -} - -static int m_show(struct seq_file *m, void *p) -{ - struct module *mod =3D list_entry(p, struct module, list); - char buf[MODULE_FLAGS_BUF_SIZE]; - void *value; - - /* We always ignore unformed modules. */ - if (mod->state =3D=3D MODULE_STATE_UNFORMED) - return 0; - - seq_printf(m, "%s %u", - mod->name, mod->init_layout.size + mod->core_layout.size); - print_unload_info(m, mod); - - /* Informative for users. */ - seq_printf(m, " %s", - mod->state =3D=3D MODULE_STATE_GOING ? "Unloading" : - mod->state =3D=3D MODULE_STATE_COMING ? "Loading" : - "Live"); - /* Used by oprofile and other similar tools. */ - value =3D m->private ? NULL : mod->core_layout.base; - seq_printf(m, " 0x%px", value); - - /* Taints info */ - if (mod->taints) - seq_printf(m, " %s", module_flags(mod, buf)); - - seq_puts(m, "\n"); - return 0; -} - -/* - * Format: modulename size refcount deps address - * - * Where refcount is a number or -, and deps is a comma-separated list - * of depends or -. - */ -static const struct seq_operations modules_op =3D { - .start =3D m_start, - .next =3D m_next, - .stop =3D m_stop, - .show =3D m_show -}; - -/* - * This also sets the "private" pointer to non-NULL if the - * kernel pointers should be hidden (so you can just test - * "m->private" to see if you should keep the values private). - * - * We use the same logic as for /proc/kallsyms. - */ -static int modules_open(struct inode *inode, struct file *file) -{ - int err =3D seq_open(file, &modules_op); - - if (!err) { - struct seq_file *m =3D file->private_data; - m->private =3D kallsyms_show_value(file->f_cred) ? NULL : (void *)8ul; - } - - return err; -} - -static const struct proc_ops modules_proc_ops =3D { - .proc_flags =3D PROC_ENTRY_PERMANENT, - .proc_open =3D modules_open, - .proc_read =3D seq_read, - .proc_lseek =3D seq_lseek, - .proc_release =3D seq_release, -}; - -static int __init proc_modules_init(void) -{ - proc_create("modules", 0, NULL, &modules_proc_ops); - return 0; -} -module_init(proc_modules_init); -#endif - /* Given an address, look for it in the module exception tables. */ const struct exception_table_entry *search_module_extables(unsigned long a= ddr) { diff --git a/kernel/module/procfs.c b/kernel/module/procfs.c new file mode 100644 index 000000000000..2717e130788e --- /dev/null +++ b/kernel/module/procfs.c @@ -0,0 +1,142 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Module proc support + * + * Copyright (C) 2008 Alexey Dobriyan + */ + +#include +#include +#include +#include +#include +#include "internal.h" + +#ifdef CONFIG_MODULE_UNLOAD +static inline void print_unload_info(struct seq_file *m, struct module *mo= d) +{ + struct module_use *use; + int printed_something =3D 0; + + seq_printf(m, " %i ", module_refcount(mod)); + + /* + * Always include a trailing , so userspace can differentiate + * between this and the old multi-field proc format. + */ + list_for_each_entry(use, &mod->source_list, source_list) { + printed_something =3D 1; + seq_printf(m, "%s,", use->source->name); + } + + if (mod->init && !mod->exit) { + printed_something =3D 1; + seq_puts(m, "[permanent],"); + } + + if (!printed_something) + seq_puts(m, "-"); +} +#else /* !CONFIG_MODULE_UNLOAD */ +static inline void print_unload_info(struct seq_file *m, struct module *mo= d) +{ + /* We don't know the usage count, or what modules are using. */ + seq_puts(m, " - -"); +} +#endif /* CONFIG_MODULE_UNLOAD */ + +/* Called by the /proc file system to return a list of modules. */ +static void *m_start(struct seq_file *m, loff_t *pos) +{ + mutex_lock(&module_mutex); + return seq_list_start(&modules, *pos); +} + +static void *m_next(struct seq_file *m, void *p, loff_t *pos) +{ + return seq_list_next(p, &modules, pos); +} + +static void m_stop(struct seq_file *m, void *p) +{ + mutex_unlock(&module_mutex); +} + +static int m_show(struct seq_file *m, void *p) +{ + struct module *mod =3D list_entry(p, struct module, list); + char buf[MODULE_FLAGS_BUF_SIZE]; + void *value; + + /* We always ignore unformed modules. */ + if (mod->state =3D=3D MODULE_STATE_UNFORMED) + return 0; + + seq_printf(m, "%s %u", + mod->name, mod->init_layout.size + mod->core_layout.size); + print_unload_info(m, mod); + + /* Informative for users. */ + seq_printf(m, " %s", + mod->state =3D=3D MODULE_STATE_GOING ? "Unloading" : + mod->state =3D=3D MODULE_STATE_COMING ? "Loading" : + "Live"); + /* Used by oprofile and other similar tools. */ + value =3D m->private ? NULL : mod->core_layout.base; + seq_printf(m, " 0x%px", value); + + /* Taints info */ + if (mod->taints) + seq_printf(m, " %s", module_flags(mod, buf)); + + seq_puts(m, "\n"); + return 0; +} + +/* + * Format: modulename size refcount deps address + * + * Where refcount is a number or -, and deps is a comma-separated list + * of depends or -. + */ +static const struct seq_operations modules_op =3D { + .start =3D m_start, + .next =3D m_next, + .stop =3D m_stop, + .show =3D m_show +}; + +/* + * This also sets the "private" pointer to non-NULL if the + * kernel pointers should be hidden (so you can just test + * "m->private" to see if you should keep the values private). + * + * We use the same logic as for /proc/kallsyms. + */ +static int modules_open(struct inode *inode, struct file *file) +{ + int err =3D seq_open(file, &modules_op); + + if (!err) { + struct seq_file *m =3D file->private_data; + + m->private =3D kallsyms_show_value(file->f_cred) ? NULL : (void *)8ul; + } + + return err; +} + +static const struct proc_ops modules_proc_ops =3D { + .proc_flags =3D PROC_ENTRY_PERMANENT, + .proc_open =3D modules_open, + .proc_read =3D seq_read, + .proc_lseek =3D seq_lseek, + .proc_release =3D seq_release, +}; + +static int __init proc_modules_init(void) +{ + proc_create("modules", 0, NULL, &modules_proc_ops); + return 0; +} +module_init(proc_modules_init); --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28BE9C433F5 for ; Mon, 7 Mar 2022 17:47:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244439AbiCGRsl (ORCPT ); Mon, 7 Mar 2022 12:48:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239146AbiCGRse (ORCPT ); Mon, 7 Mar 2022 12:48:34 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4E7806320 for ; Mon, 7 Mar 2022 09:47:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/nFeCEHT4VAKjxsShgIS9T0wVwh0OwhbuhCqF5a+FHk=; b=UXL+a8GBY8JCSwFdv4oMo5+3CAKvi5B0n4f0XAQF/aDvt8jUFjvkR1JiGlgWOkFxw+kZxI fr5OFoAlm7nlFwOcO13kLGB/X1ziRdtsfhk/yKkncfCuGeSM/U4R1Fx8viKQRwD+9oOUTy STSesQltij9JafOLL4EDeOELzAoR4RY= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-244-N-wTU5mfO2qC16KOtpS9sQ-1; Mon, 07 Mar 2022 12:47:34 -0500 X-MC-Unique: N-wTU5mfO2qC16KOtpS9sQ-1 Received: by mail-wr1-f71.google.com with SMTP id a16-20020adff7d0000000b001f0473a6b25so4537589wrq.1 for ; Mon, 07 Mar 2022 09:47:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/nFeCEHT4VAKjxsShgIS9T0wVwh0OwhbuhCqF5a+FHk=; b=gEdghGAYphwfC5/MDzn0NlR74Flc4R5HFI4MEtG6uUBJgb1LnXgC1rfctxBXcO05/K Y99nEL2cQt2ZcHEGya0KjSMXsUiJ8moAdXoF3+jSYyCGU4ihrJ8Zers7Kff+vp5fg9m5 EG1CouFCg56UeH5LKm5x91fgcdw4wfNbPfvsXyInFU6LZUUy4kEJUPlJSqp1KDM6hEuF ju2jhC+vNdTK+SayCI2MTSBHgu6gCx1Pl/x6U6YUaPkj5ArUcvWANtARBhajBHjAq2Hm pw9xYhDgxq8y0cIu4cDDg9O3vBgJCAPg+GJ6FUsM+crxZbVoaHDvBfsTTfhS3OE4nGJa hKvQ== X-Gm-Message-State: AOAM5300IWrVsu6/7C04AmKfDyWRNLEE2VJV7VsB4srePwWCsIhhi5MW Fs83iaCZDVmcZGHhDKWEux+iT7/wT3axQziC1TJAz/wdg85px3qrtbKQ9ejeJWxAQimpEYgoMBi Rzus1XcEpEPCx1+q3t1Ikq80= X-Received: by 2002:a5d:47ca:0:b0:1ef:d6ae:591a with SMTP id o10-20020a5d47ca000000b001efd6ae591amr8824302wrc.358.1646675253057; Mon, 07 Mar 2022 09:47:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJw3zB/jf3dFfPVpCFmU/sNjWg6rV4m3eAFK2qUeHUPLcyj5Gnlp9//AIlpcw+V2nvdtMzDZVQ== X-Received: by 2002:a5d:47ca:0:b0:1ef:d6ae:591a with SMTP id o10-20020a5d47ca000000b001efd6ae591amr8824274wrc.358.1646675252752; Mon, 07 Mar 2022 09:47:32 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id ay24-20020a05600c1e1800b00389a420e1ecsm322wmb.37.2022.03.07.09.47.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:47:31 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 12/14] module: Move sysfs support into a separate file Date: Mon, 7 Mar 2022 17:47:31 +0000 Message-Id: <20220307174731.2889042-1-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. This patch migrates module sysfs support out of core code into kernel/module/sysfs.c. In addition simple code refactoring to make this possible. Reviewed-by: Christophe Leroy Signed-off-by: Aaron Tomlin --- kernel/module/Makefile | 1 + kernel/module/internal.h | 21 ++ kernel/module/main.c | 469 +-------------------------------------- kernel/module/sysfs.c | 436 ++++++++++++++++++++++++++++++++++++ 4 files changed, 461 insertions(+), 466 deletions(-) create mode 100644 kernel/module/sysfs.c diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 94296c98a67f..cf8dcdc6b55f 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -16,3 +16,4 @@ obj-$(CONFIG_STRICT_MODULE_RWX) +=3D strict_rwx.o obj-$(CONFIG_DEBUG_KMEMLEAK) +=3D debug_kmemleak.o obj-$(CONFIG_KALLSYMS) +=3D kallsyms.o obj-$(CONFIG_PROC_FS) +=3D procfs.o +obj-$(CONFIG_SYSFS) +=3D sysfs.o diff --git a/kernel/module/internal.h b/kernel/module/internal.h index 6af40c2d145f..62d749ef695e 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -34,6 +34,9 @@ extern struct mutex module_mutex; extern struct list_head modules; =20 +extern struct module_attribute *modinfo_attrs[]; +extern size_t modinfo_attrs_count; + /* Provided by the linker */ extern const struct kernel_symbol __start___ksymtab[]; extern const struct kernel_symbol __stop___ksymtab[]; @@ -204,3 +207,21 @@ static inline void init_build_id(struct module *mod, c= onst struct load_info *inf static inline void layout_symtab(struct module *mod, struct load_info *inf= o) { } static inline void add_kallsyms(struct module *mod, const struct load_info= *info) { } #endif /* CONFIG_KALLSYMS */ + +#ifdef CONFIG_SYSFS +int mod_sysfs_setup(struct module *mod, const struct load_info *info, + struct kernel_param *kparam, unsigned int num_params); +void mod_sysfs_teardown(struct module *mod); +void init_param_lock(struct module *mod); +#else /* !CONFIG_SYSFS */ +static inline int mod_sysfs_setup(struct module *mod, + const struct load_info *info, + struct kernel_param *kparam, + unsigned int num_params) +{ + return 0; +} + +static inline void mod_sysfs_teardown(struct module *mod) { } +static inline void init_param_lock(struct module *mod) { } +#endif /* CONFIG_SYSFS */ diff --git a/kernel/module/main.c b/kernel/module/main.c index 44b6fd1acc44..b8a59b5c3e3a 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -14,9 +14,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -989,7 +987,7 @@ static ssize_t show_taint(struct module_attribute *matt= r, static struct module_attribute modinfo_taint =3D __ATTR(taint, 0444, show_taint, NULL); =20 -static struct module_attribute *modinfo_attrs[] =3D { +struct module_attribute *modinfo_attrs[] =3D { &module_uevent, &modinfo_version, &modinfo_srcversion, @@ -1003,6 +1001,8 @@ static struct module_attribute *modinfo_attrs[] =3D { NULL, }; =20 +size_t modinfo_attrs_count =3D ARRAY_SIZE(modinfo_attrs); + static const char vermagic[] =3D VERMAGIC_STRING; =20 static int try_to_force_load(struct module *mod, const char *reason) @@ -1253,469 +1253,6 @@ resolve_symbol_wait(struct module *mod, return ksym; } =20 -/* - * /sys/module/foo/sections stuff - * J. Corbet - */ -#ifdef CONFIG_SYSFS - -#ifdef CONFIG_KALLSYMS -struct module_sect_attr { - struct bin_attribute battr; - unsigned long address; -}; - -struct module_sect_attrs { - struct attribute_group grp; - unsigned int nsections; - struct module_sect_attr attrs[]; -}; - -#define MODULE_SECT_READ_SIZE (3 /* "0x", "\n" */ + (BITS_PER_LONG / 4)) -static ssize_t module_sect_read(struct file *file, struct kobject *kobj, - struct bin_attribute *battr, - char *buf, loff_t pos, size_t count) -{ - struct module_sect_attr *sattr =3D - container_of(battr, struct module_sect_attr, battr); - char bounce[MODULE_SECT_READ_SIZE + 1]; - size_t wrote; - - if (pos !=3D 0) - return -EINVAL; - - /* - * Since we're a binary read handler, we must account for the - * trailing NUL byte that sprintf will write: if "buf" is - * too small to hold the NUL, or the NUL is exactly the last - * byte, the read will look like it got truncated by one byte. - * Since there is no way to ask sprintf nicely to not write - * the NUL, we have to use a bounce buffer. - */ - wrote =3D scnprintf(bounce, sizeof(bounce), "0x%px\n", - kallsyms_show_value(file->f_cred) - ? (void *)sattr->address : NULL); - count =3D min(count, wrote); - memcpy(buf, bounce, count); - - return count; -} - -static void free_sect_attrs(struct module_sect_attrs *sect_attrs) -{ - unsigned int section; - - for (section =3D 0; section < sect_attrs->nsections; section++) - kfree(sect_attrs->attrs[section].battr.attr.name); - kfree(sect_attrs); -} - -static void add_sect_attrs(struct module *mod, const struct load_info *inf= o) -{ - unsigned int nloaded =3D 0, i, size[2]; - struct module_sect_attrs *sect_attrs; - struct module_sect_attr *sattr; - struct bin_attribute **gattr; - - /* Count loaded sections and allocate structures */ - for (i =3D 0; i < info->hdr->e_shnum; i++) - if (!sect_empty(&info->sechdrs[i])) - nloaded++; - size[0] =3D ALIGN(struct_size(sect_attrs, attrs, nloaded), - sizeof(sect_attrs->grp.bin_attrs[0])); - size[1] =3D (nloaded + 1) * sizeof(sect_attrs->grp.bin_attrs[0]); - sect_attrs =3D kzalloc(size[0] + size[1], GFP_KERNEL); - if (sect_attrs =3D=3D NULL) - return; - - /* Setup section attributes. */ - sect_attrs->grp.name =3D "sections"; - sect_attrs->grp.bin_attrs =3D (void *)sect_attrs + size[0]; - - sect_attrs->nsections =3D 0; - sattr =3D §_attrs->attrs[0]; - gattr =3D §_attrs->grp.bin_attrs[0]; - for (i =3D 0; i < info->hdr->e_shnum; i++) { - Elf_Shdr *sec =3D &info->sechdrs[i]; - if (sect_empty(sec)) - continue; - sysfs_bin_attr_init(&sattr->battr); - sattr->address =3D sec->sh_addr; - sattr->battr.attr.name =3D - kstrdup(info->secstrings + sec->sh_name, GFP_KERNEL); - if (sattr->battr.attr.name =3D=3D NULL) - goto out; - sect_attrs->nsections++; - sattr->battr.read =3D module_sect_read; - sattr->battr.size =3D MODULE_SECT_READ_SIZE; - sattr->battr.attr.mode =3D 0400; - *(gattr++) =3D &(sattr++)->battr; - } - *gattr =3D NULL; - - if (sysfs_create_group(&mod->mkobj.kobj, §_attrs->grp)) - goto out; - - mod->sect_attrs =3D sect_attrs; - return; - out: - free_sect_attrs(sect_attrs); -} - -static void remove_sect_attrs(struct module *mod) -{ - if (mod->sect_attrs) { - sysfs_remove_group(&mod->mkobj.kobj, - &mod->sect_attrs->grp); - /* - * We are positive that no one is using any sect attrs - * at this point. Deallocate immediately. - */ - free_sect_attrs(mod->sect_attrs); - mod->sect_attrs =3D NULL; - } -} - -/* - * /sys/module/foo/notes/.section.name gives contents of SHT_NOTE sections. - */ - -struct module_notes_attrs { - struct kobject *dir; - unsigned int notes; - struct bin_attribute attrs[]; -}; - -static ssize_t module_notes_read(struct file *filp, struct kobject *kobj, - struct bin_attribute *bin_attr, - char *buf, loff_t pos, size_t count) -{ - /* - * The caller checked the pos and count against our size. - */ - memcpy(buf, bin_attr->private + pos, count); - return count; -} - -static void free_notes_attrs(struct module_notes_attrs *notes_attrs, - unsigned int i) -{ - if (notes_attrs->dir) { - while (i-- > 0) - sysfs_remove_bin_file(notes_attrs->dir, - ¬es_attrs->attrs[i]); - kobject_put(notes_attrs->dir); - } - kfree(notes_attrs); -} - -static void add_notes_attrs(struct module *mod, const struct load_info *in= fo) -{ - unsigned int notes, loaded, i; - struct module_notes_attrs *notes_attrs; - struct bin_attribute *nattr; - - /* failed to create section attributes, so can't create notes */ - if (!mod->sect_attrs) - return; - - /* Count notes sections and allocate structures. */ - notes =3D 0; - for (i =3D 0; i < info->hdr->e_shnum; i++) - if (!sect_empty(&info->sechdrs[i]) && - (info->sechdrs[i].sh_type =3D=3D SHT_NOTE)) - ++notes; - - if (notes =3D=3D 0) - return; - - notes_attrs =3D kzalloc(struct_size(notes_attrs, attrs, notes), - GFP_KERNEL); - if (notes_attrs =3D=3D NULL) - return; - - notes_attrs->notes =3D notes; - nattr =3D ¬es_attrs->attrs[0]; - for (loaded =3D i =3D 0; i < info->hdr->e_shnum; ++i) { - if (sect_empty(&info->sechdrs[i])) - continue; - if (info->sechdrs[i].sh_type =3D=3D SHT_NOTE) { - sysfs_bin_attr_init(nattr); - nattr->attr.name =3D mod->sect_attrs->attrs[loaded].battr.attr.name; - nattr->attr.mode =3D S_IRUGO; - nattr->size =3D info->sechdrs[i].sh_size; - nattr->private =3D (void *) info->sechdrs[i].sh_addr; - nattr->read =3D module_notes_read; - ++nattr; - } - ++loaded; - } - - notes_attrs->dir =3D kobject_create_and_add("notes", &mod->mkobj.kobj); - if (!notes_attrs->dir) - goto out; - - for (i =3D 0; i < notes; ++i) - if (sysfs_create_bin_file(notes_attrs->dir, - ¬es_attrs->attrs[i])) - goto out; - - mod->notes_attrs =3D notes_attrs; - return; - - out: - free_notes_attrs(notes_attrs, i); -} - -static void remove_notes_attrs(struct module *mod) -{ - if (mod->notes_attrs) - free_notes_attrs(mod->notes_attrs, mod->notes_attrs->notes); -} - -#else - -static inline void add_sect_attrs(struct module *mod, - const struct load_info *info) -{ -} - -static inline void remove_sect_attrs(struct module *mod) -{ -} - -static inline void add_notes_attrs(struct module *mod, - const struct load_info *info) -{ -} - -static inline void remove_notes_attrs(struct module *mod) -{ -} -#endif /* CONFIG_KALLSYMS */ - -static void del_usage_links(struct module *mod) -{ -#ifdef CONFIG_MODULE_UNLOAD - struct module_use *use; - - mutex_lock(&module_mutex); - list_for_each_entry(use, &mod->target_list, target_list) - sysfs_remove_link(use->target->holders_dir, mod->name); - mutex_unlock(&module_mutex); -#endif -} - -static int add_usage_links(struct module *mod) -{ - int ret =3D 0; -#ifdef CONFIG_MODULE_UNLOAD - struct module_use *use; - - mutex_lock(&module_mutex); - list_for_each_entry(use, &mod->target_list, target_list) { - ret =3D sysfs_create_link(use->target->holders_dir, - &mod->mkobj.kobj, mod->name); - if (ret) - break; - } - mutex_unlock(&module_mutex); - if (ret) - del_usage_links(mod); -#endif - return ret; -} - -static void module_remove_modinfo_attrs(struct module *mod, int end); - -static int module_add_modinfo_attrs(struct module *mod) -{ - struct module_attribute *attr; - struct module_attribute *temp_attr; - int error =3D 0; - int i; - - mod->modinfo_attrs =3D kzalloc((sizeof(struct module_attribute) * - (ARRAY_SIZE(modinfo_attrs) + 1)), - GFP_KERNEL); - if (!mod->modinfo_attrs) - return -ENOMEM; - - temp_attr =3D mod->modinfo_attrs; - for (i =3D 0; (attr =3D modinfo_attrs[i]); i++) { - if (!attr->test || attr->test(mod)) { - memcpy(temp_attr, attr, sizeof(*temp_attr)); - sysfs_attr_init(&temp_attr->attr); - error =3D sysfs_create_file(&mod->mkobj.kobj, - &temp_attr->attr); - if (error) - goto error_out; - ++temp_attr; - } - } - - return 0; - -error_out: - if (i > 0) - module_remove_modinfo_attrs(mod, --i); - else - kfree(mod->modinfo_attrs); - return error; -} - -static void module_remove_modinfo_attrs(struct module *mod, int end) -{ - struct module_attribute *attr; - int i; - - for (i =3D 0; (attr =3D &mod->modinfo_attrs[i]); i++) { - if (end >=3D 0 && i > end) - break; - /* pick a field to test for end of list */ - if (!attr->attr.name) - break; - sysfs_remove_file(&mod->mkobj.kobj, &attr->attr); - if (attr->free) - attr->free(mod); - } - kfree(mod->modinfo_attrs); -} - -static void mod_kobject_put(struct module *mod) -{ - DECLARE_COMPLETION_ONSTACK(c); - mod->mkobj.kobj_completion =3D &c; - kobject_put(&mod->mkobj.kobj); - wait_for_completion(&c); -} - -static int mod_sysfs_init(struct module *mod) -{ - int err; - struct kobject *kobj; - - if (!module_sysfs_initialized) { - pr_err("%s: module sysfs not initialized\n", mod->name); - err =3D -EINVAL; - goto out; - } - - kobj =3D kset_find_obj(module_kset, mod->name); - if (kobj) { - pr_err("%s: module is already loaded\n", mod->name); - kobject_put(kobj); - err =3D -EINVAL; - goto out; - } - - mod->mkobj.mod =3D mod; - - memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj)); - mod->mkobj.kobj.kset =3D module_kset; - err =3D kobject_init_and_add(&mod->mkobj.kobj, &module_ktype, NULL, - "%s", mod->name); - if (err) - mod_kobject_put(mod); - -out: - return err; -} - -static int mod_sysfs_setup(struct module *mod, - const struct load_info *info, - struct kernel_param *kparam, - unsigned int num_params) -{ - int err; - - err =3D mod_sysfs_init(mod); - if (err) - goto out; - - mod->holders_dir =3D kobject_create_and_add("holders", &mod->mkobj.kobj); - if (!mod->holders_dir) { - err =3D -ENOMEM; - goto out_unreg; - } - - err =3D module_param_sysfs_setup(mod, kparam, num_params); - if (err) - goto out_unreg_holders; - - err =3D module_add_modinfo_attrs(mod); - if (err) - goto out_unreg_param; - - err =3D add_usage_links(mod); - if (err) - goto out_unreg_modinfo_attrs; - - add_sect_attrs(mod, info); - add_notes_attrs(mod, info); - - return 0; - -out_unreg_modinfo_attrs: - module_remove_modinfo_attrs(mod, -1); -out_unreg_param: - module_param_sysfs_remove(mod); -out_unreg_holders: - kobject_put(mod->holders_dir); -out_unreg: - mod_kobject_put(mod); -out: - return err; -} - -static void mod_sysfs_fini(struct module *mod) -{ - remove_notes_attrs(mod); - remove_sect_attrs(mod); - mod_kobject_put(mod); -} - -static void init_param_lock(struct module *mod) -{ - mutex_init(&mod->param_lock); -} -#else /* !CONFIG_SYSFS */ - -static int mod_sysfs_setup(struct module *mod, - const struct load_info *info, - struct kernel_param *kparam, - unsigned int num_params) -{ - return 0; -} - -static void mod_sysfs_fini(struct module *mod) -{ -} - -static void module_remove_modinfo_attrs(struct module *mod, int end) -{ -} - -static void del_usage_links(struct module *mod) -{ -} - -static void init_param_lock(struct module *mod) -{ -} -#endif /* CONFIG_SYSFS */ - -static void mod_sysfs_teardown(struct module *mod) -{ - del_usage_links(mod); - module_remove_modinfo_attrs(mod, -1); - module_param_sysfs_remove(mod); - kobject_put(mod->mkobj.drivers_dir); - kobject_put(mod->holders_dir); - mod_sysfs_fini(mod); -} - /* * LKM RO/NX protection: protect module's text/ro-data * from modification and any data from execution. diff --git a/kernel/module/sysfs.c b/kernel/module/sysfs.c new file mode 100644 index 000000000000..ce68f821dcd1 --- /dev/null +++ b/kernel/module/sysfs.c @@ -0,0 +1,436 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Module sysfs support + * + * Copyright (C) 2008 Rusty Russell + */ + +#include +#include +#include +#include +#include +#include +#include +#include "internal.h" + +/* + * /sys/module/foo/sections stuff + * J. Corbet + */ +#ifdef CONFIG_KALLSYMS +struct module_sect_attr { + struct bin_attribute battr; + unsigned long address; +}; + +struct module_sect_attrs { + struct attribute_group grp; + unsigned int nsections; + struct module_sect_attr attrs[]; +}; + +#define MODULE_SECT_READ_SIZE (3 /* "0x", "\n" */ + (BITS_PER_LONG / 4)) +static ssize_t module_sect_read(struct file *file, struct kobject *kobj, + struct bin_attribute *battr, + char *buf, loff_t pos, size_t count) +{ + struct module_sect_attr *sattr =3D + container_of(battr, struct module_sect_attr, battr); + char bounce[MODULE_SECT_READ_SIZE + 1]; + size_t wrote; + + if (pos !=3D 0) + return -EINVAL; + + /* + * Since we're a binary read handler, we must account for the + * trailing NUL byte that sprintf will write: if "buf" is + * too small to hold the NUL, or the NUL is exactly the last + * byte, the read will look like it got truncated by one byte. + * Since there is no way to ask sprintf nicely to not write + * the NUL, we have to use a bounce buffer. + */ + wrote =3D scnprintf(bounce, sizeof(bounce), "0x%px\n", + kallsyms_show_value(file->f_cred) + ? (void *)sattr->address : NULL); + count =3D min(count, wrote); + memcpy(buf, bounce, count); + + return count; +} + +static void free_sect_attrs(struct module_sect_attrs *sect_attrs) +{ + unsigned int section; + + for (section =3D 0; section < sect_attrs->nsections; section++) + kfree(sect_attrs->attrs[section].battr.attr.name); + kfree(sect_attrs); +} + +static void add_sect_attrs(struct module *mod, const struct load_info *inf= o) +{ + unsigned int nloaded =3D 0, i, size[2]; + struct module_sect_attrs *sect_attrs; + struct module_sect_attr *sattr; + struct bin_attribute **gattr; + + /* Count loaded sections and allocate structures */ + for (i =3D 0; i < info->hdr->e_shnum; i++) + if (!sect_empty(&info->sechdrs[i])) + nloaded++; + size[0] =3D ALIGN(struct_size(sect_attrs, attrs, nloaded), + sizeof(sect_attrs->grp.bin_attrs[0])); + size[1] =3D (nloaded + 1) * sizeof(sect_attrs->grp.bin_attrs[0]); + sect_attrs =3D kzalloc(size[0] + size[1], GFP_KERNEL); + if (!sect_attrs) + return; + + /* Setup section attributes. */ + sect_attrs->grp.name =3D "sections"; + sect_attrs->grp.bin_attrs =3D (void *)sect_attrs + size[0]; + + sect_attrs->nsections =3D 0; + sattr =3D §_attrs->attrs[0]; + gattr =3D §_attrs->grp.bin_attrs[0]; + for (i =3D 0; i < info->hdr->e_shnum; i++) { + Elf_Shdr *sec =3D &info->sechdrs[i]; + + if (sect_empty(sec)) + continue; + sysfs_bin_attr_init(&sattr->battr); + sattr->address =3D sec->sh_addr; + sattr->battr.attr.name =3D + kstrdup(info->secstrings + sec->sh_name, GFP_KERNEL); + if (!sattr->battr.attr.name) + goto out; + sect_attrs->nsections++; + sattr->battr.read =3D module_sect_read; + sattr->battr.size =3D MODULE_SECT_READ_SIZE; + sattr->battr.attr.mode =3D 0400; + *(gattr++) =3D &(sattr++)->battr; + } + *gattr =3D NULL; + + if (sysfs_create_group(&mod->mkobj.kobj, §_attrs->grp)) + goto out; + + mod->sect_attrs =3D sect_attrs; + return; +out: + free_sect_attrs(sect_attrs); +} + +static void remove_sect_attrs(struct module *mod) +{ + if (mod->sect_attrs) { + sysfs_remove_group(&mod->mkobj.kobj, + &mod->sect_attrs->grp); + /* + * We are positive that no one is using any sect attrs + * at this point. Deallocate immediately. + */ + free_sect_attrs(mod->sect_attrs); + mod->sect_attrs =3D NULL; + } +} + +/* + * /sys/module/foo/notes/.section.name gives contents of SHT_NOTE sections. + */ + +struct module_notes_attrs { + struct kobject *dir; + unsigned int notes; + struct bin_attribute attrs[]; +}; + +static ssize_t module_notes_read(struct file *filp, struct kobject *kobj, + struct bin_attribute *bin_attr, + char *buf, loff_t pos, size_t count) +{ + /* + * The caller checked the pos and count against our size. + */ + memcpy(buf, bin_attr->private + pos, count); + return count; +} + +static void free_notes_attrs(struct module_notes_attrs *notes_attrs, + unsigned int i) +{ + if (notes_attrs->dir) { + while (i-- > 0) + sysfs_remove_bin_file(notes_attrs->dir, + ¬es_attrs->attrs[i]); + kobject_put(notes_attrs->dir); + } + kfree(notes_attrs); +} + +static void add_notes_attrs(struct module *mod, const struct load_info *in= fo) +{ + unsigned int notes, loaded, i; + struct module_notes_attrs *notes_attrs; + struct bin_attribute *nattr; + + /* failed to create section attributes, so can't create notes */ + if (!mod->sect_attrs) + return; + + /* Count notes sections and allocate structures. */ + notes =3D 0; + for (i =3D 0; i < info->hdr->e_shnum; i++) + if (!sect_empty(&info->sechdrs[i]) && + info->sechdrs[i].sh_type =3D=3D SHT_NOTE) + ++notes; + + if (notes =3D=3D 0) + return; + + notes_attrs =3D kzalloc(struct_size(notes_attrs, attrs, notes), + GFP_KERNEL); + if (!notes_attrs) + return; + + notes_attrs->notes =3D notes; + nattr =3D ¬es_attrs->attrs[0]; + for (loaded =3D i =3D 0; i < info->hdr->e_shnum; ++i) { + if (sect_empty(&info->sechdrs[i])) + continue; + if (info->sechdrs[i].sh_type =3D=3D SHT_NOTE) { + sysfs_bin_attr_init(nattr); + nattr->attr.name =3D mod->sect_attrs->attrs[loaded].battr.attr.name; + nattr->attr.mode =3D 0444; + nattr->size =3D info->sechdrs[i].sh_size; + nattr->private =3D (void *)info->sechdrs[i].sh_addr; + nattr->read =3D module_notes_read; + ++nattr; + } + ++loaded; + } + + notes_attrs->dir =3D kobject_create_and_add("notes", &mod->mkobj.kobj); + if (!notes_attrs->dir) + goto out; + + for (i =3D 0; i < notes; ++i) + if (sysfs_create_bin_file(notes_attrs->dir, + ¬es_attrs->attrs[i])) + goto out; + + mod->notes_attrs =3D notes_attrs; + return; + +out: + free_notes_attrs(notes_attrs, i); +} + +static void remove_notes_attrs(struct module *mod) +{ + if (mod->notes_attrs) + free_notes_attrs(mod->notes_attrs, mod->notes_attrs->notes); +} + +#else /* !CONFIG_KALLSYMS */ +static inline void add_sect_attrs(struct module *mod, const struct load_in= fo *info) { } +static inline void remove_sect_attrs(struct module *mod) { } +static inline void add_notes_attrs(struct module *mod, const struct load_i= nfo *info) { } +static inline void remove_notes_attrs(struct module *mod) { } +#endif /* CONFIG_KALLSYMS */ + +static void del_usage_links(struct module *mod) +{ +#ifdef CONFIG_MODULE_UNLOAD + struct module_use *use; + + mutex_lock(&module_mutex); + list_for_each_entry(use, &mod->target_list, target_list) + sysfs_remove_link(use->target->holders_dir, mod->name); + mutex_unlock(&module_mutex); +#endif +} + +static int add_usage_links(struct module *mod) +{ + int ret =3D 0; +#ifdef CONFIG_MODULE_UNLOAD + struct module_use *use; + + mutex_lock(&module_mutex); + list_for_each_entry(use, &mod->target_list, target_list) { + ret =3D sysfs_create_link(use->target->holders_dir, + &mod->mkobj.kobj, mod->name); + if (ret) + break; + } + mutex_unlock(&module_mutex); + if (ret) + del_usage_links(mod); +#endif + return ret; +} + +static void module_remove_modinfo_attrs(struct module *mod, int end) +{ + struct module_attribute *attr; + int i; + + for (i =3D 0; (attr =3D &mod->modinfo_attrs[i]); i++) { + if (end >=3D 0 && i > end) + break; + /* pick a field to test for end of list */ + if (!attr->attr.name) + break; + sysfs_remove_file(&mod->mkobj.kobj, &attr->attr); + if (attr->free) + attr->free(mod); + } + kfree(mod->modinfo_attrs); +} + +static int module_add_modinfo_attrs(struct module *mod) +{ + struct module_attribute *attr; + struct module_attribute *temp_attr; + int error =3D 0; + int i; + + mod->modinfo_attrs =3D kzalloc((sizeof(struct module_attribute) * + (modinfo_attrs_count + 1)), + GFP_KERNEL); + if (!mod->modinfo_attrs) + return -ENOMEM; + + temp_attr =3D mod->modinfo_attrs; + for (i =3D 0; (attr =3D modinfo_attrs[i]); i++) { + if (!attr->test || attr->test(mod)) { + memcpy(temp_attr, attr, sizeof(*temp_attr)); + sysfs_attr_init(&temp_attr->attr); + error =3D sysfs_create_file(&mod->mkobj.kobj, + &temp_attr->attr); + if (error) + goto error_out; + ++temp_attr; + } + } + + return 0; + +error_out: + if (i > 0) + module_remove_modinfo_attrs(mod, --i); + else + kfree(mod->modinfo_attrs); + return error; +} + +static void mod_kobject_put(struct module *mod) +{ + DECLARE_COMPLETION_ONSTACK(c); + + mod->mkobj.kobj_completion =3D &c; + kobject_put(&mod->mkobj.kobj); + wait_for_completion(&c); +} + +static int mod_sysfs_init(struct module *mod) +{ + int err; + struct kobject *kobj; + + if (!module_sysfs_initialized) { + pr_err("%s: module sysfs not initialized\n", mod->name); + err =3D -EINVAL; + goto out; + } + + kobj =3D kset_find_obj(module_kset, mod->name); + if (kobj) { + pr_err("%s: module is already loaded\n", mod->name); + kobject_put(kobj); + err =3D -EINVAL; + goto out; + } + + mod->mkobj.mod =3D mod; + + memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj)); + mod->mkobj.kobj.kset =3D module_kset; + err =3D kobject_init_and_add(&mod->mkobj.kobj, &module_ktype, NULL, + "%s", mod->name); + if (err) + mod_kobject_put(mod); + +out: + return err; +} + +int mod_sysfs_setup(struct module *mod, + const struct load_info *info, + struct kernel_param *kparam, + unsigned int num_params) +{ + int err; + + err =3D mod_sysfs_init(mod); + if (err) + goto out; + + mod->holders_dir =3D kobject_create_and_add("holders", &mod->mkobj.kobj); + if (!mod->holders_dir) { + err =3D -ENOMEM; + goto out_unreg; + } + + err =3D module_param_sysfs_setup(mod, kparam, num_params); + if (err) + goto out_unreg_holders; + + err =3D module_add_modinfo_attrs(mod); + if (err) + goto out_unreg_param; + + err =3D add_usage_links(mod); + if (err) + goto out_unreg_modinfo_attrs; + + add_sect_attrs(mod, info); + add_notes_attrs(mod, info); + + return 0; + +out_unreg_modinfo_attrs: + module_remove_modinfo_attrs(mod, -1); +out_unreg_param: + module_param_sysfs_remove(mod); +out_unreg_holders: + kobject_put(mod->holders_dir); +out_unreg: + mod_kobject_put(mod); +out: + return err; +} + +static void mod_sysfs_fini(struct module *mod) +{ + remove_notes_attrs(mod); + remove_sect_attrs(mod); + mod_kobject_put(mod); +} + +void mod_sysfs_teardown(struct module *mod) +{ + del_usage_links(mod); + module_remove_modinfo_attrs(mod, -1); + module_param_sysfs_remove(mod); + kobject_put(mod->mkobj.drivers_dir); + kobject_put(mod->holders_dir); + mod_sysfs_fini(mod); +} + +void init_param_lock(struct module *mod) +{ + mutex_init(&mod->param_lock); +} --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74861C433EF for ; Mon, 7 Mar 2022 17:48:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244583AbiCGRs4 (ORCPT ); Mon, 7 Mar 2022 12:48:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244524AbiCGRsn (ORCPT ); Mon, 7 Mar 2022 12:48:43 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0B20E1D33F for ; Mon, 7 Mar 2022 09:47:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XzDd/KuuRgH8He0fXa6WBPwvyUAPEEoXAXfWyEFzqbI=; b=Qnuj53J1cpNOG1B/VnTjxhW23FM9JapkhvwLvm6thvZ7oPhVhTszj5GQXA0WQfDC4nXkMg veJLVXdcZIkn/tGP6nYlAk9rVCKxr9ftWtfer/ojcVmtpboqdRUKO1bBMGBAgty9hZ07jr b24MJ5J27AxjD1/e67jOdRgZzJsvuaQ= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-672-D36QSkokNRqMyFuUQYCe6w-1; Mon, 07 Mar 2022 12:47:44 -0500 X-MC-Unique: D36QSkokNRqMyFuUQYCe6w-1 Received: by mail-wr1-f71.google.com with SMTP id f9-20020a5d58e9000000b001f0247e5e96so4823179wrd.15 for ; Mon, 07 Mar 2022 09:47:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XzDd/KuuRgH8He0fXa6WBPwvyUAPEEoXAXfWyEFzqbI=; b=Eg4IkgOBppgnzxsc2e27FZrMnBTzRskILL4MOGuAnz0XL1M20WK2p42ZApTY02+CpJ a+RsB4IAcVpmoDq81FNWrnX6jxgwknl1cBPQC9dD4w8HXowZave7uTYO/jkyVeawkxp2 dHOREQY+ahpM3FYg0v3czPjGX5RvKtqGagYff3zVKexctVZS8rqRF4g+sK07valSfq+2 N6PWz9nBPag7fOZUeNSId/+fiAnt2xWNmn16G2LV6Tb41Ix0oqYlI6fbnVvbMocjT6b5 3xMIfiSGPIc1IayJb2PR7tO0FoqXYURpRhSI95G5GWIQFv1WY74elIWgkneH2GpvX0d8 rnFQ== X-Gm-Message-State: AOAM530VeputRRfjG4g8VhpKX3TuFVH+ImMb3NVolPOAVVGlwYApCPsR B5b1ceO+wya9st1Qfy3MtBF0LxV1nNjeTE+Wrg3KIP1kazgxTUeU5EuE6+TCNvDj22KareAzNir SmaK5GNjo+7AMqrgpGEOlyfo= X-Received: by 2002:a5d:68d2:0:b0:1f0:653f:108d with SMTP id p18-20020a5d68d2000000b001f0653f108dmr8978766wrw.283.1646675263229; Mon, 07 Mar 2022 09:47:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxVk4tcMQi5mW47Ahdmqg2rUqP8i7z7pOFRgPMY0DeuLvwNEa+sw6CpAJbavkC1217W0I2MNQ== X-Received: by 2002:a5d:68d2:0:b0:1f0:653f:108d with SMTP id p18-20020a5d68d2000000b001f0653f108dmr8978741wrw.283.1646675263015; Mon, 07 Mar 2022 09:47:43 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id n9-20020a1c7209000000b00389a616615csm359383wmc.2.2022.03.07.09.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:47:42 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 13/14] module: Move kdb module related code out of main kdb code Date: Mon, 7 Mar 2022 17:47:41 +0000 Message-Id: <20220307174741.2889588-1-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. This patch migrates the kdb 'lsmod' command support out of main kdb code into its own file under kernel/module. In addition to the above, a minor style warning i.e. missing a blank line after declarations, was resolved too. The new file was added to MAINTAINERS. Signed-off-by: Aaron Tomlin --- MAINTAINERS | 1 + include/linux/kdb.h | 1 + kernel/debug/kdb/kdb_main.c | 49 --------------------------------- kernel/module/Makefile | 1 + kernel/module/kdb.c | 55 +++++++++++++++++++++++++++++++++++++ kernel/module/main.c | 4 --- 6 files changed, 58 insertions(+), 53 deletions(-) create mode 100644 kernel/module/kdb.c diff --git a/MAINTAINERS b/MAINTAINERS index 195cf1ac2ee8..40c717f93c1a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10689,6 +10689,7 @@ F: drivers/tty/serial/kgdboc.c F: include/linux/kdb.h F: include/linux/kgdb.h F: kernel/debug/ +F: kernel/module/kdb.c =20 KHADAS MCU MFD DRIVER M: Neil Armstrong diff --git a/include/linux/kdb.h b/include/linux/kdb.h index ea0f5e580fac..07dfb6a20a1c 100644 --- a/include/linux/kdb.h +++ b/include/linux/kdb.h @@ -222,5 +222,6 @@ enum { =20 extern int kdbgetintenv(const char *, int *); extern int kdb_set(int, const char **); +int kdb_lsmod(int argc, const char **argv); =20 #endif /* !_KDB_H */ diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index 0852a537dad4..f3a30cd5037f 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -2004,54 +2003,6 @@ static int kdb_ef(int argc, const char **argv) return 0; } =20 -#if defined(CONFIG_MODULES) -/* - * kdb_lsmod - This function implements the 'lsmod' command. Lists - * currently loaded kernel modules. - * Mostly taken from userland lsmod. - */ -static int kdb_lsmod(int argc, const char **argv) -{ - struct module *mod; - - if (argc !=3D 0) - return KDB_ARGCOUNT; - - kdb_printf("Module Size modstruct Used by\n"); - list_for_each_entry(mod, kdb_modules, list) { - if (mod->state =3D=3D MODULE_STATE_UNFORMED) - continue; - - kdb_printf("%-20s%8u 0x%px ", mod->name, - mod->core_layout.size, (void *)mod); -#ifdef CONFIG_MODULE_UNLOAD - kdb_printf("%4d ", module_refcount(mod)); -#endif - if (mod->state =3D=3D MODULE_STATE_GOING) - kdb_printf(" (Unloading)"); - else if (mod->state =3D=3D MODULE_STATE_COMING) - kdb_printf(" (Loading)"); - else - kdb_printf(" (Live)"); - kdb_printf(" 0x%px", mod->core_layout.base); - -#ifdef CONFIG_MODULE_UNLOAD - { - struct module_use *use; - kdb_printf(" [ "); - list_for_each_entry(use, &mod->source_list, - source_list) - kdb_printf("%s ", use->target->name); - kdb_printf("]\n"); - } -#endif - } - - return 0; -} - -#endif /* CONFIG_MODULES */ - /* * kdb_env - This function implements the 'env' command. Display the * current environment variables. diff --git a/kernel/module/Makefile b/kernel/module/Makefile index cf8dcdc6b55f..88f5cdcdb067 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -17,3 +17,4 @@ obj-$(CONFIG_DEBUG_KMEMLEAK) +=3D debug_kmemleak.o obj-$(CONFIG_KALLSYMS) +=3D kallsyms.o obj-$(CONFIG_PROC_FS) +=3D procfs.o obj-$(CONFIG_SYSFS) +=3D sysfs.o +obj-$(CONFIG_KGDB_KDB) +=3D kdb.o diff --git a/kernel/module/kdb.c b/kernel/module/kdb.c new file mode 100644 index 000000000000..60baeebea3e0 --- /dev/null +++ b/kernel/module/kdb.c @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Module kdb support + * + * Copyright (C) 2010 Jason Wessel + */ + +#include +#include +#include "internal.h" + +/* + * kdb_lsmod - This function implements the 'lsmod' command. Lists + * currently loaded kernel modules. + * Mostly taken from userland lsmod. + */ +int kdb_lsmod(int argc, const char **argv) +{ + struct module *mod; + + if (argc !=3D 0) + return KDB_ARGCOUNT; + + kdb_printf("Module Size modstruct Used by\n"); + list_for_each_entry(mod, &modules, list) { + if (mod->state =3D=3D MODULE_STATE_UNFORMED) + continue; + + kdb_printf("%-20s%8u 0x%px ", mod->name, + mod->core_layout.size, (void *)mod); +#ifdef CONFIG_MODULE_UNLOAD + kdb_printf("%4d ", module_refcount(mod)); +#endif + if (mod->state =3D=3D MODULE_STATE_GOING) + kdb_printf(" (Unloading)"); + else if (mod->state =3D=3D MODULE_STATE_COMING) + kdb_printf(" (Loading)"); + else + kdb_printf(" (Live)"); + kdb_printf(" 0x%px", mod->core_layout.base); + +#ifdef CONFIG_MODULE_UNLOAD + { + struct module_use *use; + kdb_printf(" [ "); + list_for_each_entry(use, &mod->source_list, + source_list) + kdb_printf("%s ", use->target->name); + kdb_printf("]\n"); + } +#endif + } + + return 0; +} diff --git a/kernel/module/main.c b/kernel/module/main.c index b8a59b5c3e3a..bcc4f7a82649 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -108,10 +108,6 @@ static void mod_update_bounds(struct module *mod) __mod_update_bounds(mod->init_layout.base, mod->init_layout.size); } =20 -#ifdef CONFIG_KGDB_KDB -struct list_head *kdb_modules =3D &modules; /* kdb needs the list of modul= es */ -#endif /* CONFIG_KGDB_KDB */ - static void module_assert_mutex_or_preempt(void) { #ifdef CONFIG_LOCKDEP --=20 2.34.1 From nobody Tue Jun 23 10:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F0B6C433F5 for ; Mon, 7 Mar 2022 17:48:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244595AbiCGRtM (ORCPT ); Mon, 7 Mar 2022 12:49:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244531AbiCGRs7 (ORCPT ); Mon, 7 Mar 2022 12:48:59 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D047F2D1E8 for ; Mon, 7 Mar 2022 09:48:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646675280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SiYMP4DA9TozF4xuyhOCEQgRS/pjqscFIVWb9t8F7R4=; b=U4RlXyn4EUqheJ0oOMIAMPmCJhavc/hkGWbsmKJJWwZzy959xfLW1fizbjFIn/5DL/pTVn 7J8AucFIH1RszxRvkGj+l2nrl1aAYDaEdsJgiBfVzZeDidr1V27X6HzwSgr23p6/z5p+IN FLUFLfTTbB+EQJMOu1dg0Jteok0xsJc= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-380-27FGugedNmC0Woj1Qs6fBQ-1; Mon, 07 Mar 2022 12:47:59 -0500 X-MC-Unique: 27FGugedNmC0Woj1Qs6fBQ-1 Received: by mail-wm1-f72.google.com with SMTP id c62-20020a1c3541000000b003815245c642so8139602wma.6 for ; Mon, 07 Mar 2022 09:47:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SiYMP4DA9TozF4xuyhOCEQgRS/pjqscFIVWb9t8F7R4=; b=mT35sPEB5YRqCW9Sqo2X8AqDKy/ws/gWhvFcZLINKEW32lYR9SgxTrCR3IZx2MhY75 3qcAuHIofGwH2OzxK1D6/qcFIrkB/e6VIrosacBKtvNLHAfPQ1Jetish0JFvTUg/abdj /jUS5cRzBz5LdaxKXw4u+w7rfmIMxCBpSkWNukcwqkbAvsPEpBGekvDJX4q1JVclN++B 7AC6b5Se1KVvykGLSBgH2nhIDBBzn/rJ9wrvdTEDiU9HjUmHcts/o/bpcpFLidC5gExD 3AZgmpjQFGeOI9O9N5hgpoMWLtVL35Itg+DyL2wuvv6Il9n7CqLggbLOMEcNXx7c4NZY z2SA== X-Gm-Message-State: AOAM530PdzWRsPPnUAaXpjMnvlk5adWNFfYIFRJpNhvdRoYv6vfhcpV0 BHJrVF8a4+7x2qQBxuYMfdJe/TV05eplvgyGu5TiyxMt7vent+KiSvZZmhFZ0ohMskwlGAn2lu4 xhtW9OQ1UysatgD5Rqe87IKs= X-Received: by 2002:a05:600c:588:b0:389:9e5f:59d3 with SMTP id o8-20020a05600c058800b003899e5f59d3mr43215wmd.35.1646675277049; Mon, 07 Mar 2022 09:47:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzuaDUOvunUxjcZpd/wE9JP67TO/I+mNpM+m0oOBs7ThtP8C1RHIHEGZUmzoJ29FfT39JX4Ew== X-Received: by 2002:a05:600c:588:b0:389:9e5f:59d3 with SMTP id o8-20020a05600c058800b003899e5f59d3mr43194wmd.35.1646675276731; Mon, 07 Mar 2022 09:47:56 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id g7-20020a5d5407000000b001f0be7a7578sm8706296wrv.5.2022.03.07.09.47.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 09:47:56 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org, hch@infradead.org, pmladek@suse.com Subject: [PATCH v10 14/14] module: Move version support into a separate file Date: Mon, 7 Mar 2022 17:47:55 +0000 Message-Id: <20220307174755.2890142-1-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220307174509.2887714-1-atomlin@redhat.com> References: <20220307174509.2887714-1-atomlin@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" No functional change. This patch migrates module version support out of core code into kernel/module/version.c. In addition simple code refactoring to make this possible. Reviewed-by: Christophe Leroy Signed-off-by: Aaron Tomlin --- kernel/module/Makefile | 1 + kernel/module/internal.h | 48 ++++++++++++ kernel/module/main.c | 156 ++------------------------------------- kernel/module/version.c | 109 +++++++++++++++++++++++++++ 4 files changed, 166 insertions(+), 148 deletions(-) create mode 100644 kernel/module/version.c diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 88f5cdcdb067..e2eff9853a28 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -18,3 +18,4 @@ obj-$(CONFIG_KALLSYMS) +=3D kallsyms.o obj-$(CONFIG_PROC_FS) +=3D procfs.o obj-$(CONFIG_SYSFS) +=3D sysfs.o obj-$(CONFIG_KGDB_KDB) +=3D kdb.o +obj-$(CONFIG_MODVERSIONS) +=3D version.o diff --git a/kernel/module/internal.h b/kernel/module/internal.h index 62d749ef695e..3fc139d5074b 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -70,7 +70,27 @@ struct load_info { } index; }; =20 +enum mod_license { + NOT_GPL_ONLY, + GPL_ONLY, +}; + +struct find_symbol_arg { + /* Input */ + const char *name; + bool gplok; + bool warn; + + /* Output */ + struct module *owner; + const s32 *crc; + const struct kernel_symbol *sym; + enum mod_license license; +}; + int mod_verify_sig(const void *mod, struct load_info *info); +int try_to_force_load(struct module *mod, const char *reason); +bool find_symbol(struct find_symbol_arg *fsa); struct module *find_module_all(const char *name, size_t len, bool even_unf= ormed); int cmp_name(const void *name, const void *sym); long module_get_offset(struct module *mod, unsigned int *size, Elf_Shdr *s= echdr, @@ -225,3 +245,31 @@ static inline int mod_sysfs_setup(struct module *mod, static inline void mod_sysfs_teardown(struct module *mod) { } static inline void init_param_lock(struct module *mod) { } #endif /* CONFIG_SYSFS */ + +#ifdef CONFIG_MODVERSIONS +int check_version(const struct load_info *info, + const char *symname, struct module *mod, const s32 *crc); +void module_layout(struct module *mod, struct modversion_info *ver, struct= kernel_param *kp, + struct kernel_symbol *ks, struct tracepoint * const *tp); +int check_modstruct_version(const struct load_info *info, struct module *m= od); +int same_magic(const char *amagic, const char *bmagic, bool has_crcs); +#else /* !CONFIG_MODVERSIONS */ +static inline int check_version(const struct load_info *info, + const char *symname, + struct module *mod, + const s32 *crc) +{ + return 1; +} + +static inline int check_modstruct_version(const struct load_info *info, + struct module *mod) +{ + return 1; +} + +static inline int same_magic(const char *amagic, const char *bmagic, bool = has_crcs) +{ + return strcmp(amagic, bmagic) =3D=3D 0; +} +#endif /* CONFIG_MODVERSIONS */ diff --git a/kernel/module/main.c b/kernel/module/main.c index bcc4f7a82649..0749afdc34b5 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -86,6 +86,12 @@ struct mod_tree_root mod_tree __cacheline_aligned =3D { static unsigned long module_addr_min =3D -1UL, module_addr_max; #endif /* CONFIG_MODULES_TREE_LOOKUP */ =20 +struct symsearch { + const struct kernel_symbol *start, *stop; + const s32 *crcs; + enum mod_license license; +}; + /* * Bounds of module text, for speeding up __module_address. * Protected by module_mutex. @@ -244,28 +250,6 @@ static __maybe_unused void *any_section_objs(const str= uct load_info *info, #define symversion(base, idx) ((base !=3D NULL) ? ((base) + (idx)) : NULL) #endif =20 -struct symsearch { - const struct kernel_symbol *start, *stop; - const s32 *crcs; - enum mod_license { - NOT_GPL_ONLY, - GPL_ONLY, - } license; -}; - -struct find_symbol_arg { - /* Input */ - const char *name; - bool gplok; - bool warn; - - /* Output */ - struct module *owner; - const s32 *crc; - const struct kernel_symbol *sym; - enum mod_license license; -}; - static bool check_exported_symbol(const struct symsearch *syms, struct module *owner, unsigned int symnum, void *data) @@ -327,7 +311,7 @@ static bool find_exported_symbol_in_section(const struc= t symsearch *syms, * Find an exported symbol and return it, along with, (optional) crc and * (optional) module which owns it. Needs preempt disabled or module_mute= x. */ -static bool find_symbol(struct find_symbol_arg *fsa) +bool find_symbol(struct find_symbol_arg *fsa) { static const struct symsearch arr[] =3D { { __start___ksymtab, __stop___ksymtab, __start___kcrctab, @@ -1001,7 +985,7 @@ size_t modinfo_attrs_count =3D ARRAY_SIZE(modinfo_attr= s); =20 static const char vermagic[] =3D VERMAGIC_STRING; =20 -static int try_to_force_load(struct module *mod, const char *reason) +int try_to_force_load(struct module *mod, const char *reason) { #ifdef CONFIG_MODULE_FORCE_LOAD if (!test_taint(TAINT_FORCED_MODULE)) @@ -1013,115 +997,6 @@ static int try_to_force_load(struct module *mod, con= st char *reason) #endif } =20 -#ifdef CONFIG_MODVERSIONS - -static u32 resolve_rel_crc(const s32 *crc) -{ - return *(u32 *)((void *)crc + *crc); -} - -static int check_version(const struct load_info *info, - const char *symname, - struct module *mod, - const s32 *crc) -{ - Elf_Shdr *sechdrs =3D info->sechdrs; - unsigned int versindex =3D info->index.vers; - unsigned int i, num_versions; - struct modversion_info *versions; - - /* Exporting module didn't supply crcs? OK, we're already tainted. */ - if (!crc) - return 1; - - /* No versions at all? modprobe --force does this. */ - if (versindex =3D=3D 0) - return try_to_force_load(mod, symname) =3D=3D 0; - - versions =3D (void *) sechdrs[versindex].sh_addr; - num_versions =3D sechdrs[versindex].sh_size - / sizeof(struct modversion_info); - - for (i =3D 0; i < num_versions; i++) { - u32 crcval; - - if (strcmp(versions[i].name, symname) !=3D 0) - continue; - - if (IS_ENABLED(CONFIG_MODULE_REL_CRCS)) - crcval =3D resolve_rel_crc(crc); - else - crcval =3D *crc; - if (versions[i].crc =3D=3D crcval) - return 1; - pr_debug("Found checksum %X vs module %lX\n", - crcval, versions[i].crc); - goto bad_version; - } - - /* Broken toolchain. Warn once, then let it go.. */ - pr_warn_once("%s: no symbol version for %s\n", info->name, symname); - return 1; - -bad_version: - pr_warn("%s: disagrees about version of symbol %s\n", - info->name, symname); - return 0; -} - -static inline int check_modstruct_version(const struct load_info *info, - struct module *mod) -{ - struct find_symbol_arg fsa =3D { - .name =3D "module_layout", - .gplok =3D true, - }; - - /* - * Since this should be found in kernel (which can't be removed), no - * locking is necessary -- use preempt_disable() to placate lockdep. - */ - preempt_disable(); - if (!find_symbol(&fsa)) { - preempt_enable(); - BUG(); - } - preempt_enable(); - return check_version(info, "module_layout", mod, fsa.crc); -} - -/* First part is kernel version, which we ignore if module has crcs. */ -static inline int same_magic(const char *amagic, const char *bmagic, - bool has_crcs) -{ - if (has_crcs) { - amagic +=3D strcspn(amagic, " "); - bmagic +=3D strcspn(bmagic, " "); - } - return strcmp(amagic, bmagic) =3D=3D 0; -} -#else -static inline int check_version(const struct load_info *info, - const char *symname, - struct module *mod, - const s32 *crc) -{ - return 1; -} - -static inline int check_modstruct_version(const struct load_info *info, - struct module *mod) -{ - return 1; -} - -static inline int same_magic(const char *amagic, const char *bmagic, - bool has_crcs) -{ - return strcmp(amagic, bmagic) =3D=3D 0; -} -#endif /* CONFIG_MODVERSIONS */ - static char *get_modinfo(const struct load_info *info, const char *tag); static char *get_next_modinfo(const struct load_info *info, const char *ta= g, char *prev); @@ -3247,18 +3122,3 @@ void print_modules(void) pr_cont(" [last unloaded: %s]", last_unloaded_module); pr_cont("\n"); } - -#ifdef CONFIG_MODVERSIONS -/* - * Generate the signature for all relevant module structures here. - * If these change, we don't want to try to parse the module. - */ -void module_layout(struct module *mod, - struct modversion_info *ver, - struct kernel_param *kp, - struct kernel_symbol *ks, - struct tracepoint * const *tp) -{ -} -EXPORT_SYMBOL(module_layout); -#endif diff --git a/kernel/module/version.c b/kernel/module/version.c new file mode 100644 index 000000000000..adaedce1dc97 --- /dev/null +++ b/kernel/module/version.c @@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Module version support + * + * Copyright (C) 2008 Rusty Russell + */ + +#include +#include +#include +#include "internal.h" + +static u32 resolve_rel_crc(const s32 *crc) +{ + return *(u32 *)((void *)crc + *crc); +} + +int check_version(const struct load_info *info, + const char *symname, + struct module *mod, + const s32 *crc) +{ + Elf_Shdr *sechdrs =3D info->sechdrs; + unsigned int versindex =3D info->index.vers; + unsigned int i, num_versions; + struct modversion_info *versions; + + /* Exporting module didn't supply crcs? OK, we're already tainted. */ + if (!crc) + return 1; + + /* No versions at all? modprobe --force does this. */ + if (versindex =3D=3D 0) + return try_to_force_load(mod, symname) =3D=3D 0; + + versions =3D (void *)sechdrs[versindex].sh_addr; + num_versions =3D sechdrs[versindex].sh_size + / sizeof(struct modversion_info); + + for (i =3D 0; i < num_versions; i++) { + u32 crcval; + + if (strcmp(versions[i].name, symname) !=3D 0) + continue; + + if (IS_ENABLED(CONFIG_MODULE_REL_CRCS)) + crcval =3D resolve_rel_crc(crc); + else + crcval =3D *crc; + if (versions[i].crc =3D=3D crcval) + return 1; + pr_debug("Found checksum %X vs module %lX\n", + crcval, versions[i].crc); + goto bad_version; + } + + /* Broken toolchain. Warn once, then let it go.. */ + pr_warn_once("%s: no symbol version for %s\n", info->name, symname); + return 1; + +bad_version: + pr_warn("%s: disagrees about version of symbol %s\n", info->name, symname= ); + return 0; +} + +int check_modstruct_version(const struct load_info *info, + struct module *mod) +{ + struct find_symbol_arg fsa =3D { + .name =3D "module_layout", + .gplok =3D true, + }; + + /* + * Since this should be found in kernel (which can't be removed), no + * locking is necessary -- use preempt_disable() to placate lockdep. + */ + preempt_disable(); + if (!find_symbol(&fsa)) { + preempt_enable(); + BUG(); + } + preempt_enable(); + return check_version(info, "module_layout", mod, fsa.crc); +} + +/* First part is kernel version, which we ignore if module has crcs. */ +int same_magic(const char *amagic, const char *bmagic, + bool has_crcs) +{ + if (has_crcs) { + amagic +=3D strcspn(amagic, " "); + bmagic +=3D strcspn(bmagic, " "); + } + return strcmp(amagic, bmagic) =3D=3D 0; +} + +/* + * Generate the signature for all relevant module structures here. + * If these change, we don't want to try to parse the module. + */ +void module_layout(struct module *mod, + struct modversion_info *ver, + struct kernel_param *kp, + struct kernel_symbol *ks, + struct tracepoint * const *tp) +{ +} +EXPORT_SYMBOL(module_layout); --=20 2.34.1