From nobody Tue Jun 30 00:47:01 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 666EAC4332F for ; Fri, 28 Jan 2022 20:39:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344418AbiA1Ujp (ORCPT ); Fri, 28 Jan 2022 15:39:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31639 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238856AbiA1Ujk (ORCPT ); Fri, 28 Jan 2022 15:39:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402379; 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=JV4WzeMBxzAOtiGbJsE6/WwOSD8dA4tNDcXqNuD6cVU=; b=FboyR/uo1030jotymSUg15EQ18DVcHPCp7JHtivRPl5f7hpTEgtRrweL+m5FFYsabTfqX7 Whn8FvYzvWyo+t/Wtf6bDPWQ+smQOYBkZb+wl7/dBpY44/U8kjeNCWBjJXBVNC0B+cl/y+ aFtfd2+/LF89del3QryMDLv4c4zCYlU= 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-442-xM9XmDMkPC6LVs_KnjLcaQ-1; Fri, 28 Jan 2022 15:39:38 -0500 X-MC-Unique: xM9XmDMkPC6LVs_KnjLcaQ-1 Received: by mail-wm1-f69.google.com with SMTP id f188-20020a1c1fc5000000b0034d79edde84so1681327wmf.0 for ; Fri, 28 Jan 2022 12:39:38 -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=JV4WzeMBxzAOtiGbJsE6/WwOSD8dA4tNDcXqNuD6cVU=; b=jjNz1vz9IEi0WeTsS4GtnIkkuZcNgEDizcLtv0ifWrF9OSRJD1sipKjFeUAewtjPRh glSvhBSA1qMZ4ap0pB0CZtRLe7ate3mu1KIUpfAjkzha5VEaJ4ZgFdCM1UwQ9fFmcsZ9 N3TR3vDAA//wzu3XHAmuKSAwxQgtl464waE+U2Fqa05WpDypZJ5+LAARFSnxGJvwAB6e 8Bt4o3cIoagJFG25D8FrlINVRt/ua4TI/sqmjgQei/cZlEo6ncOV/+7A5SUfldEOn4qV tT4zsIUq7sASClm4NxtPksYaoZkw5/JYzx5MV/zhnP75T9vIRSHuz5BBws2QXOYgXDyi WekQ== X-Gm-Message-State: AOAM531Bt9A8+LgGa2nksDT3uSCisGB5xJLguhiznZzIJHvl/tj4Ifbo i1o3Xu+4KDkKswHUV8z+IH+cSlsxnXAOFbHG7JV/2n8Z2vfJEc/OY1ghlq7bC0JAyZAV/c27YC7 8UEVR0QKEoyIv/pWRMC0/24w= X-Received: by 2002:a05:6000:1e1b:: with SMTP id bj27mr8365760wrb.657.1643402377396; Fri, 28 Jan 2022 12:39:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwat6ybFLb9gq0x9VWY0GfMIL4ymq66PC7SK70+KVL+qPaj3vREMNy9pj2QUs5R9Xd6zRb2Yg== X-Received: by 2002:a05:6000:1e1b:: with SMTP id bj27mr8365738wrb.657.1643402377137; Fri, 28 Jan 2022 12:39:37 -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 d2sm5383316wru.40.2022.01.28.12.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:36 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 01/13] module: Move all into module/ Date: Fri, 28 Jan 2022 20:39:22 +0000 Message-Id: <20220128203934.600247-2-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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. Signed-off-by: Aaron Tomlin --- MAINTAINERS | 2 +- kernel/Makefile | 5 +---- kernel/module/Makefile | 9 +++++++++ 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_signature.c =3D> module/signature.c} | 0 kernel/{module_signing.c =3D> module/signing.c} | 2 +- 8 files changed, 14 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_signature.c =3D> module/signature.c} (100%) rename kernel/{module_signing.c =3D> module/signing.c} (97%) diff --git a/MAINTAINERS b/MAINTAINERS index acd112c42255..a98f4700acb7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12976,7 +12976,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/main.c =20 MONOLITHIC POWER SYSTEM PMIC DRIVER M: Saravanan Sekar diff --git a/kernel/Makefile b/kernel/Makefile index 56f4ee97f328..3a6380975c57 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -53,6 +53,7 @@ obj-y +=3D rcu/ obj-y +=3D livepatch/ obj-y +=3D dma/ obj-y +=3D entry/ +obj-y +=3D module/ =20 obj-$(CONFIG_KCMP) +=3D kcmp.o obj-$(CONFIG_FREEZER) +=3D freezer.o @@ -66,10 +67,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 obj-$(CONFIG_CRASH_CORE) +=3D crash_core.o diff --git a/kernel/module/Makefile b/kernel/module/Makefile new file mode 100644 index 000000000000..2902fc7d0ef1 --- /dev/null +++ b/kernel/module/Makefile @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Makefile for linux kernel module support +# + +obj-$(CONFIG_MODULES) +=3D main.o +obj-$(CONFIG_MODULE_DECOMPRESS) +=3D decompress.o +obj-$(CONFIG_MODULE_SIG) +=3D signing.o +obj-$(CONFIG_MODULE_SIG_FORMAT) +=3D signature.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 b01c69c2ff99..c153fd8a4444 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 387ee77bdbd6..d8c6269af6cf 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_signature.c b/kernel/module/signature.c similarity index 100% rename from kernel/module_signature.c rename to kernel/module/signature.c 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 30 00:47:01 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 304AAC433EF for ; Fri, 28 Jan 2022 20:39:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351215AbiA1Uju (ORCPT ); Fri, 28 Jan 2022 15:39:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:44818 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240697AbiA1Ujl (ORCPT ); Fri, 28 Jan 2022 15:39:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402380; 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=CKFHu1mwRyMCd3tE6xfYJyy3RgbH1D0nAbWrHT5RWOU=; b=axA3pjk7c5NpMwtJo8aKHvM/cPPmhcXBvEA3OyO6+J1HGQZhZiWK8KZvtuvaviah30jj4s W42/zSaWqgONc6zS2RkEV3QMyBbn81ZOEmGPe9863hdC+HD5rQUULl1ihu23lQaYI187ZP d32Iu2QAVSKq48IOrFzF+X4OscM8HZQ= 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-435-3RsQddSqPaWRSOnz9qJSAQ-1; Fri, 28 Jan 2022 15:39:39 -0500 X-MC-Unique: 3RsQddSqPaWRSOnz9qJSAQ-1 Received: by mail-wm1-f72.google.com with SMTP id bg16-20020a05600c3c9000b0034bea12c043so6423136wmb.7 for ; Fri, 28 Jan 2022 12:39:39 -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=CKFHu1mwRyMCd3tE6xfYJyy3RgbH1D0nAbWrHT5RWOU=; b=csPpjodm7vAlq3zrU1DrX+I8cqI7xJzuvWXvyk01MQ9lrpR9aFgpxk0WS06nJYQGuK Rvhm+TOEolim9dpD2SbQ9tR7glHoFA+E5Yw6Rr4ft57E4hQ/+/uLz/1dBW431ceOKBi2 dLIBODgq3tHRNZ+NDIKLlt/aAAc8VnCAjto7s1hHOSp4AEjFzQ29XZcKZy+LBzZdetqK yS0+0LravmP+hnp50xd4uzIAtk20C/aj9hLCah+1vdq83aUwG2U3ArtApII2Cefgb30g SGSppX6hy+Bq6jK1kLanryouVKDdrcPnabR0jtMNz1kSP2Hj8VTA9C4fczewZhqezzDK ckCg== X-Gm-Message-State: AOAM532RhsEt/PhKLM82ASnKdeMft19mPeQ9npE6FQQU9UgRKpPGPd9G nTPInZOdbiDu5GFAGZLEESS3zOdHZQGDiazUNL5Th+NB2PWNP/2MyZTbFRwknDNPtsDFiQZpNSg v2K3rSglObS3ykAtTEcZPGYI= X-Received: by 2002:a05:600c:1ca0:: with SMTP id k32mr7305026wms.62.1643402378589; Fri, 28 Jan 2022 12:39:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJx071r+pfGCf25/UPxmKSKMz79BwnrKoE01zXclK8LWdr1k4TAP66d3QLFEJ4AAKM2Umk5oMg== X-Received: by 2002:a05:600c:1ca0:: with SMTP id k32mr7305003wms.62.1643402378384; Fri, 28 Jan 2022 12:39:38 -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 f13sm6960199wry.77.2022.01.28.12.39.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:37 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 02/13] module: Simple refactor in preparation for split Date: Fri, 28 Jan 2022 20:39:23 +0000 Message-Id: <20220128203934.600247-3-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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. Signed-off-by: Aaron Tomlin --- kernel/module/internal.h | 22 ++++++++++++++++++++++ kernel/module/main.c | 23 ++--------------------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/kernel/module/internal.h b/kernel/module/internal.h index 8c381c99062f..e3c593f8767f 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -7,6 +7,28 @@ =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) +#define MODULE_SECT_READ_SIZE (3 /* "0x", "\n" */ + (BITS_PER_LONG / 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 d8c6269af6cf..fee64c4957f3 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 @@ -1490,7 +1475,6 @@ struct module_sect_attrs { struct module_sect_attr attrs[]; }; =20 -#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) @@ -4555,9 +4539,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 30 00:47:01 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 66461C433FE for ; Fri, 28 Jan 2022 20:40:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351234AbiA1Uj6 (ORCPT ); Fri, 28 Jan 2022 15:39:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:27162 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344360AbiA1Ujn (ORCPT ); Fri, 28 Jan 2022 15:39:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402383; 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=d16QLh1b9mk2jCD+hTXFdS67qH+rGFScBQ+xHFcVQ8Y=; b=Jof6ekRY33TwuYlEDVCTui0oOl1NNbTlHxIk/ULoKX20u0QkdnZ3LtkOgFhx7vpo3dOlR7 MtAeBJytVHsjLIkBufDVtz/GDDA5YXERUE2/4aaxiPn2hPH2/mgSQCWGTGfB7w54G/tzNk G4uo2S34xHDrJ+EiSVNa3Zsua+XjILY= 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-584-TM0mOraNPxaiSF0iCLCImQ-1; Fri, 28 Jan 2022 15:39:42 -0500 X-MC-Unique: TM0mOraNPxaiSF0iCLCImQ-1 Received: by mail-wm1-f71.google.com with SMTP id m189-20020a1c26c6000000b003508ba87dfbso1675491wmm.7 for ; Fri, 28 Jan 2022 12:39:41 -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=d16QLh1b9mk2jCD+hTXFdS67qH+rGFScBQ+xHFcVQ8Y=; b=TQxiwetkweQS+SvZKJT+rGN7OxdJkzsQyoO3+W2BjEnxF/3Un0T5mNPZdYgq/cfisj RZY00zBBTNuaVPFpWlHb5oS1N8/W0WKI2d5VsEiTLEWLvkMJloXkbl7jhAoGeGgaVEjG JpM0JFpFJhuRlcZG/t+L9N2QOt89jIhXi2sU6AhYYU+PNNZvqC9w0/4nnuQX6DbvXcGw 2aBcM6+ETcY9qDjBcjrg4p7oSyxfsrZo+jzwbgaWwAJOrvmPGAnWhP+ddQzYLUT2jOc5 LmVhO9IpTpFMgYag4uH9G+QxLNtGOVNiVMjCMBfneZbg1rWTrz77dB+YUOEs98suISNe jNoQ== X-Gm-Message-State: AOAM5305M56rtoyZdH7qvc4Jld5bF4wTG6pVi9mY7pC6/xP/UJdHRaEe r9s9fdMbn+L/5TVxa+RD3++Ahk44dCCjqn2fVcpKRFw7S3sccnjOA57iqqZW2PFtnoGC48B39X3 zeSTOEPHikh+4Dil1QE+7iOY= X-Received: by 2002:a5d:458d:: with SMTP id p13mr8704485wrq.580.1643402379772; Fri, 28 Jan 2022 12:39:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJznnzOL+XK7/yi1zY0r025gKwZSHdCpphgz/2vVbU3vAB//bhuSlyCOuDAonCMMExhli3rjdg== X-Received: by 2002:a5d:458d:: with SMTP id p13mr8704476wrq.580.1643402379519; Fri, 28 Jan 2022 12:39:39 -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 u14sm5309946wrm.58.2022.01.28.12.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:39 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 03/13] module: Move livepatch support to a separate file Date: Fri, 28 Jan 2022 20:39:24 +0000 Message-Id: <20220128203934.600247-4-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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. Signed-off-by: Aaron Tomlin --- include/linux/module.h | 11 ++++ kernel/module/Makefile | 1 + kernel/module/internal.h | 10 ++++ kernel/module/livepatch.c | 74 +++++++++++++++++++++++++++ kernel/module/main.c | 102 ++++---------------------------------- 5 files changed, 106 insertions(+), 92 deletions(-) create mode 100644 kernel/module/livepatch.c diff --git a/include/linux/module.h b/include/linux/module.h index f4338235ed2c..8d49f12a7601 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -668,11 +668,22 @@ static inline bool is_livepatch_module(struct module = *mod) { return mod->klp; } + +static inline bool set_livepatch_module(struct module *mod) +{ + mod->klp =3D true; + return true; +} #else /* !CONFIG_LIVEPATCH */ static inline bool is_livepatch_module(struct module *mod) { return false; } + +static inline bool set_livepatch_module(struct module *mod) +{ + return false; +} #endif /* CONFIG_LIVEPATCH */ =20 bool is_module_sig_enforced(void); diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 2902fc7d0ef1..ba3ebdb7055b 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_MODULES) +=3D main.o obj-$(CONFIG_MODULE_DECOMPRESS) +=3D decompress.o obj-$(CONFIG_MODULE_SIG) +=3D signing.o obj-$(CONFIG_MODULE_SIG_FORMAT) +=3D signature.o +obj-$(CONFIG_LIVEPATCH) +=3D livepatch.o diff --git a/kernel/module/internal.h b/kernel/module/internal.h index e3c593f8767f..0cd624179545 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -57,6 +57,16 @@ struct load_info { =20 extern int mod_verify_sig(const void *mod, struct load_info *info); =20 +#ifdef CONFIG_LIVEPATCH +extern int copy_module_elf(struct module *mod, struct load_info *info); +extern 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 */ #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..961045d32332 --- /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 =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_kall= syms.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 fee64c4957f3..c91c7e57bca7 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2042,81 +2042,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) { /* @@ -3091,30 +3016,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 30 00:47:01 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 25CCAC433EF for ; Fri, 28 Jan 2022 20:39:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351296AbiA1Ujy (ORCPT ); Fri, 28 Jan 2022 15:39:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49117 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344363AbiA1Ujn (ORCPT ); Fri, 28 Jan 2022 15:39:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402383; 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=0CNcxvm7n1RCGlI5KmT6BeLnySyjUrrthgmbjpeW11k=; b=DZg6u0g6eE67Vv/WKPaCCsm1dcXWeHyPyjdE7aR/ANMob7hyH3ICzGparSDptQ9Uu/tDOv jPbwyJCiuE7fO7oZTK5LbW4oETczKfndk31/xdfJE5uCJgPBjo5KABe8/GXSz1ECovPmUJ eYgy7qQjtadWKFCOtrU5c6Rz9mTXEo8= 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-125-N9WtB8_6Nr6K5tgDuQYDTg-1; Fri, 28 Jan 2022 15:39:42 -0500 X-MC-Unique: N9WtB8_6Nr6K5tgDuQYDTg-1 Received: by mail-wm1-f72.google.com with SMTP id f7-20020a1cc907000000b0034b63f314ccso3456924wmb.6 for ; Fri, 28 Jan 2022 12:39:42 -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=0CNcxvm7n1RCGlI5KmT6BeLnySyjUrrthgmbjpeW11k=; b=tufDUlTfuY+NjAw4NHr7Kktzawov8vRVRr5pYunoFuMP859WuwjoU0kSElZ28e5wbQ B8ufrakZhozDcnGfg0+gnYRWGz6Lmd5beofFMInO2bz8GL+xXgvHYhTBtw8A5L4D/eSj QpITD3eICj+pqTRuKoxaLhKpmdCR0kmRY0lDpsGF82CXKVIiRU7oE2X0R+3ZJ7idbbf5 CF46PKlcYKmdVgjK5R8dIF7akw5M8FyOD1+zk7zDU8TUtDG8GLZouKjJKNoJCAZNc52Q mWVqHN8CFzpQykct6OhLjCfbIFxF37G1KjFmOExQ1th5hTb/uIodiXSiow+/BjTl749G becQ== X-Gm-Message-State: AOAM531M80xzoMDdEZ+Ek3j7FFW3bUgZMdafjphHLNqYyVMoC83naulv kehROV/w+QKJ3pWQCzJyg1hYi+NhXAyQX+ryFzpI7yKwTZj7Xf9pjesuR/qX3MskfWj5nmNir+V a6kPtTaY1VPcmwIO1BVsUKK0= X-Received: by 2002:a1c:cc05:: with SMTP id h5mr17222262wmb.32.1643402381038; Fri, 28 Jan 2022 12:39:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJwLUdJTerc/z0Y5BOoF7WuuUHjf7RDGJvwRwKDPSht7koL78mE0rpXlafn0RtjHb0qHvrc+qA== X-Received: by 2002:a1c:cc05:: with SMTP id h5mr17222242wmb.32.1643402380810; Fri, 28 Jan 2022 12:39:40 -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 a9sm3158690wmm.32.2022.01.28.12.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:40 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 04/13] module: Move latched RB-tree support to a separate file Date: Fri, 28 Jan 2022 20:39:25 +0000 Message-Id: <20220128203934.600247-5-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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. Signed-off-by: Aaron Tomlin --- include/linux/module.h | 37 +++++++++- kernel/module/Makefile | 1 + kernel/module/main.c | 134 ------------------------------------ kernel/module/tree_lookup.c | 108 +++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 136 deletions(-) create mode 100644 kernel/module/tree_lookup.c diff --git a/include/linux/module.h b/include/linux/module.h index 8d49f12a7601..377bdb9952cf 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -340,11 +340,44 @@ struct module_layout { }; =20 #ifdef CONFIG_MODULES_TREE_LOOKUP +struct mod_tree_root { + struct latch_tree_root root; + unsigned long addr_min; + unsigned long addr_max; +} mod_tree __cacheline_aligned =3D { + .addr_min =3D -1UL, +}; + +#define module_addr_min mod_tree.addr_min +#define module_addr_max mod_tree.addr_max + +extern void mod_tree_insert(struct module *mod); +extern void mod_tree_remove_init(struct module *mod); +extern void mod_tree_remove(struct module *mod); +extern struct module *mod_find(unsigned long addr); /* Only touch one cacheline for common rbtree-for-core-layout case. */ #define __module_layout_align ____cacheline_aligned -#else +#else /* !CONFIG_MODULES_TREE_LOOKUP */ + +static unsigned long module_addr_min =3D -1UL, module_addr_max; + +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; +} #define __module_layout_align -#endif +#endif /* CONFIG_MODULES_TREE_LOOKUP */ =20 struct mod_kallsyms { Elf_Sym *symtab; diff --git a/kernel/module/Makefile b/kernel/module/Makefile index ba3ebdb7055b..5990d2e4566d 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -8,3 +8,4 @@ obj-$(CONFIG_MODULE_DECOMPRESS) +=3D decompress.o obj-$(CONFIG_MODULE_SIG) +=3D signing.o obj-$(CONFIG_MODULE_SIG_FORMAT) +=3D signature.o obj-$(CONFIG_LIVEPATCH) +=3D livepatch.o +obj-$(CONFIG_MODULES_TREE_LOOKUP) +=3D tree_lookup.o diff --git a/kernel/module/main.c b/kernel/module/main.c index c91c7e57bca7..5c7c3201b5b4 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -89,140 +89,6 @@ static void do_free_init(struct work_struct *w); 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 { - .addr_min =3D -1UL, -}; - -#define module_addr_min mod_tree.addr_min -#define module_addr_max mod_tree.addr_max - -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 */ - /* * Bounds of module text, for speeding up __module_address. * Protected by module_mutex. diff --git a/kernel/module/tree_lookup.c b/kernel/module/tree_lookup.c new file mode 100644 index 000000000000..5f6d6de2dc60 --- /dev/null +++ b/kernel/module/tree_lookup.c @@ -0,0 +1,108 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Modules tree lookup + * + * Copyright (C) 2015 Peter Zijlstra + * Copyright (C) 2015 Rusty Russell + */ + +#include +#include + +/* + * 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. + */ + +__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; +} + +__always_inline unsigned long __mod_tree_size(struct latch_tree_node *n) +{ + struct module_layout *layout =3D container_of(n, struct module_layout, mt= n.node); + + return (unsigned long)layout->size; +} + +__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); +} + +__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; +} + +const struct latch_tree_ops mod_tree_ops =3D { + .less =3D mod_tree_less, + .comp =3D mod_tree_comp, +}; + +noinline void __mod_tree_insert(struct mod_tree_node *node) +{ + latch_tree_insert(&node->node, &mod_tree.root, &mod_tree_ops); +} + +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 30 00:47:01 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 75623C433FE for ; Fri, 28 Jan 2022 20:40:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351377AbiA1UkD (ORCPT ); Fri, 28 Jan 2022 15:40:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40244 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344405AbiA1Ujp (ORCPT ); Fri, 28 Jan 2022 15:39:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402384; 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=u3+US9coizvidEZ8omLRER4gflB6ywCQZcnY38EWjAY=; b=BMSJY2Yqel5h7eEsIfU5l73Ztd+U1QF660N6FDGbBJWmeU+qmT6ztU2nwgcZuxTHccjv+Z pxyHS+f1MafwmLcr0pYcOJjcjmx0B0lwRSYF2BpcOEdXjBAm2p0RRd+1LVE9g7DASHeNW1 vvha406374fUQ8ttCtX7vGw7wV6nK7E= 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-660-bdoOGxUSOtG-qmJVEbvmPg-1; Fri, 28 Jan 2022 15:39:43 -0500 X-MC-Unique: bdoOGxUSOtG-qmJVEbvmPg-1 Received: by mail-wm1-f71.google.com with SMTP id d140-20020a1c1d92000000b0034edefd55caso6427114wmd.4 for ; Fri, 28 Jan 2022 12:39:43 -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=u3+US9coizvidEZ8omLRER4gflB6ywCQZcnY38EWjAY=; b=XjyA/1tSx2MDcn4jbeyKBUcmzEzecHvKhN5PKWR+zcl5ivGmMxovZH9Rt33m3gjGfc CYYk3VOuim9feYQW3LmYwMMlTzxqmdDdKRCM7hfgEXjq5CxDfqJUO0zkQFHmrcZ8k6ap 0Zcb6cPKAoxCJmwfHfv3NkUZdAxbAPd0vazo1CRgqgOZI57xtW6f6oq2hhQZhRTnvbxH X7EBxj4a45fugyZhUwbwtgf42fNsJAYZfclWSAUlrLeL745zqd1Dj3oQIv9iS5gM8KQS qePhvzV2ZCNPBoTg6LtB49xWOWsJqMVMEdiFEXbGHhVS6HO0o/er3XfmEL17LmY4CWpk dmpw== X-Gm-Message-State: AOAM530EvGqgsrISsb+vOyeXGcz5OglEQGiiOaG+QS7lLJmftH6pM9qd b1R+fCqolPFxp21mup1/t0lJUBwWbC9bwhzS4BQC/a59ZUnpsF4QaOn4gJB1liA1df93zhhBw28 8CCRwYQdT/mBfX7h/n1+GaTw= X-Received: by 2002:a1c:f404:: with SMTP id z4mr17591248wma.165.1643402382402; Fri, 28 Jan 2022 12:39:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZ7M4+0Z0YuutTQvNS99n1rlW4eDZQBH7wns2B4hDMixRhvlHyXE3/qo/1nbvJhWwiuWq9ag== X-Received: by 2002:a1c:f404:: with SMTP id z4mr17591233wma.165.1643402382224; Fri, 28 Jan 2022 12:39:42 -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 f5sm5280239wrq.87.2022.01.28.12.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:41 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 05/13] module: Move arch strict rwx support to a separate file Date: Fri, 28 Jan 2022 20:39:26 +0000 Message-Id: <20220128203934.600247-6-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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 applicable architecture code that support strict module rwx from core module code into kernel/module/arch_strict_rwx.c Signed-off-by: Aaron Tomlin --- include/linux/module.h | 17 +++++++++++ kernel/module/Makefile | 1 + kernel/module/arch_strict_rwx.c | 44 ++++++++++++++++++++++++++++ kernel/module/main.c | 51 --------------------------------- 4 files changed, 62 insertions(+), 51 deletions(-) create mode 100644 kernel/module/arch_strict_rwx.c diff --git a/include/linux/module.h b/include/linux/module.h index 377bdb9952cf..35552164830d 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -339,6 +339,23 @@ struct module_layout { #endif }; =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) + +extern void frob_text(const struct module_layout *layout, + int (*set_memory)(unsigned long start, int num_pages)); +extern void module_enable_x(const struct module *mod); +#else /* !CONFIG_ARCH_HAS_STRICT_MODULE_RWX */ +# define debug_align(X) (X) + +static void module_enable_x(const struct module *mod) { } +#endif /* CONFIG_ARCH_HAS_STRICT_MODULE_RWX */ + #ifdef CONFIG_MODULES_TREE_LOOKUP struct mod_tree_root { struct latch_tree_root root; diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 5990d2e4566d..71341f30c3f2 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_MODULE_SIG) +=3D signing.o obj-$(CONFIG_MODULE_SIG_FORMAT) +=3D signature.o obj-$(CONFIG_LIVEPATCH) +=3D livepatch.o obj-$(CONFIG_MODULES_TREE_LOOKUP) +=3D tree_lookup.o +obj-$(CONFIG_ARCH_HAS_STRICT_MODULE_RWX) +=3D arch_strict_rwx.o diff --git a/kernel/module/arch_strict_rwx.c b/kernel/module/arch_strict_rw= x.c new file mode 100644 index 000000000000..9801cb4fef36 --- /dev/null +++ b/kernel/module/arch_strict_rwx.c @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Module arch strict rwx + * + * Copyright (C) 2015 Rusty Russell + */ + +#include +#include + +/* + * LKM RO/NX protection: protect module's text/ro-data + * from modification and any data from execution. + * + * General layout of module is: + * [text] [read-only-data] [ro-after-init] [writable data] + * text_size -----^ ^ ^ ^ + * ro_size ------------------------| | | + * ro_after_init_size -----------------------------| | + * size -----------------------------------------------------------| + * + * These values are always page-aligned (as is base) + */ + +/* + * Since some arches are moving towards PAGE_KERNEL module allocations ins= tead + * of PAGE_KERNEL_EXEC, keep frob_text() and module_enable_x() outside of = the + * CONFIG_STRICT_MODULE_RWX block below because they are needed regardless= of + * whether we are strict. + */ +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)); + set_memory((unsigned long)layout->base, + layout->text_size >> PAGE_SHIFT); +} + +void module_enable_x(const struct module *mod) +{ + frob_text(&mod->core_layout, set_memory_x); + frob_text(&mod->init_layout, set_memory_x); +} diff --git a/kernel/module/main.c b/kernel/module/main.c index 5c7c3201b5b4..fbac043b07d7 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -63,17 +62,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), @@ -1785,45 +1773,6 @@ static void mod_sysfs_teardown(struct module *mod) mod_sysfs_fini(mod); } =20 -/* - * LKM RO/NX protection: protect module's text/ro-data - * from modification and any data from execution. - * - * General layout of module is: - * [text] [read-only-data] [ro-after-init] [writable data] - * text_size -----^ ^ ^ ^ - * ro_size ------------------------| | | - * ro_after_init_size -----------------------------| | - * size -----------------------------------------------------------| - * - * These values are always page-aligned (as is base) - */ - -/* - * Since some arches are moving towards PAGE_KERNEL module allocations ins= tead - * of PAGE_KERNEL_EXEC, keep frob_text() and module_enable_x() outside of = the - * CONFIG_STRICT_MODULE_RWX block below because they are needed regardless= of - * 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)) -{ - BUG_ON((unsigned long)layout->base & (PAGE_SIZE-1)); - BUG_ON((unsigned long)layout->text_size & (PAGE_SIZE-1)); - set_memory((unsigned long)layout->base, - layout->text_size >> PAGE_SHIFT); -} - -static void module_enable_x(const struct module *mod) -{ - frob_text(&mod->core_layout, set_memory_x); - frob_text(&mod->init_layout, set_memory_x); -} -#else /* !CONFIG_ARCH_HAS_STRICT_MODULE_RWX */ -static void module_enable_x(const struct module *mod) { } -#endif /* CONFIG_ARCH_HAS_STRICT_MODULE_RWX */ - #ifdef CONFIG_STRICT_MODULE_RWX static void frob_rodata(const struct module_layout *layout, int (*set_memory)(unsigned long start, int num_pages)) --=20 2.34.1 From nobody Tue Jun 30 00:47:01 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 C918BC433F5 for ; Fri, 28 Jan 2022 20:40:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239968AbiA1UkH (ORCPT ); Fri, 28 Jan 2022 15:40:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33124 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343615AbiA1Ujq (ORCPT ); Fri, 28 Jan 2022 15:39:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402386; 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=Xbb1waqP0kwmR38UUX09e82b0OEVG9z0fGYLb99+jx8=; b=Ti+BnmvYkizeh9Rc5WgOwBOhNsdVBSTALXYdn4wt//RpMbZWNZgq+hzsFcLOCQD+M3RVi2 EhzKnL4ZYd0ccD9FmoblLjxHqZxrzAHIHh5tHfb9IeSVzZKQIIlvDtxwUWnZqPeLu+LBjd MTuicCT0btMxYWpidxbeBdyPWV3/Bb8= 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-440-iFc0p9SMN0SFf7gVwe1z5g-1; Fri, 28 Jan 2022 15:39:45 -0500 X-MC-Unique: iFc0p9SMN0SFf7gVwe1z5g-1 Received: by mail-wm1-f72.google.com with SMTP id v185-20020a1cacc2000000b0034906580813so6444352wme.1 for ; Fri, 28 Jan 2022 12:39:45 -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=Xbb1waqP0kwmR38UUX09e82b0OEVG9z0fGYLb99+jx8=; b=Hh6V2jrzLVWRxsgj4bkkATCE6vJagoHYONyHW7wI2r/yBXYafv8asr361XCl+CKyJx Xsjko5FT1n+bkkex9X4bCHtQIu4wbkcuOf5jRQfYFnnAzS3DEAexWHsro0sOaq3XTZsV cbQNorcTr7NVhVlBz1zlxvfj6mGWZCeMYs/poV3qujj7gRCl5Z+rV/IL+SsYiAsV0pI7 cOJbw2/oz8AGv0WvIWf+XnpmNabFtcsemJdh5mrk4ADmo0XFLIkHnE62hrl/D26Ykoj8 m9zwz9DxGhD9tnVimBelGg/2wg1uoWrenh0Zo45trl6HCdACCg/TFS92qjxFAJvbTMRI abxw== X-Gm-Message-State: AOAM530O/B7dtJhKTHERIf7apX3HC4M27yKRWzpXnLP7vYBbUzdJ9wkm sPE/bdFGxsDYQTeCl8wI3xsK0LHN5egSmrircOACjpbEqLQ8yhR5/2IS0hFmR+1FH0IF6iWlp/1 19kvKBGx6F6AGJFX6ZVxnlEM= X-Received: by 2002:a05:600c:410f:: with SMTP id j15mr16876879wmi.161.1643402383745; Fri, 28 Jan 2022 12:39:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJz0KmH7Sb9LA6jQrXsRA9x/tDgc/8kIU0hC69q/zFCL5hL/lNYygPpGjv9MtiL0/f2oHiR/YA== X-Received: by 2002:a05:600c:410f:: with SMTP id j15mr16876869wmi.161.1643402383571; Fri, 28 Jan 2022 12:39: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 f16sm1472309wmg.28.2022.01.28.12.39.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:43 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 06/13] module: Move strict rwx support to a separate file Date: Fri, 28 Jan 2022 20:39:27 +0000 Message-Id: <20220128203934.600247-7-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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. Signed-off-by: Aaron Tomlin --- include/linux/module.h | 22 ++++++++++ kernel/module/Makefile | 1 + kernel/module/main.c | 84 -------------------------------------- kernel/module/strict_rwx.c | 83 +++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 84 deletions(-) create mode 100644 kernel/module/strict_rwx.c diff --git a/include/linux/module.h b/include/linux/module.h index 35552164830d..7bf93c0d87e6 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -356,6 +356,28 @@ extern 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 +extern void frob_rodata(const struct module_layout *layout, + int (*set_memory)(unsigned long start, int num_pages)); +extern void frob_ro_after_init(const struct module_layout *layout, + int (*set_memory)(unsigned long start, int num_pages)); +extern void frob_writable_data(const struct module_layout *layout, + int (*set_memory)(unsigned long start, int num_pages)); +extern void module_enable_ro(const struct module *mod, bool after_init); +extern void module_enable_nx(const struct module *mod); +extern int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, + char *secstrings, struct module *mod); + +#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 */ + #ifdef CONFIG_MODULES_TREE_LOOKUP struct mod_tree_root { struct latch_tree_root root; diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 71341f30c3f2..c4198fcf4772 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_MODULE_SIG_FORMAT) +=3D signature.o obj-$(CONFIG_LIVEPATCH) +=3D livepatch.o obj-$(CONFIG_MODULES_TREE_LOOKUP) +=3D tree_lookup.o obj-$(CONFIG_ARCH_HAS_STRICT_MODULE_RWX) +=3D arch_strict_rwx.o +obj-$(CONFIG_STRICT_MODULE_RWX) +=3D strict_rwx.o diff --git a/kernel/module/main.c b/kernel/module/main.c index fbac043b07d7..4f590b0c7aca 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -1773,90 +1773,6 @@ static void mod_sysfs_teardown(struct module *mod) mod_sysfs_fini(mod); } =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..39060021755a --- /dev/null +++ b/kernel/module/strict_rwx.c @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Module strict rwx + * + * Copyright (C) 2015 Rusty Russell + */ + +#include +#include +#include + +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); +} + +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); +} + +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); +} + +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 30 00:47:01 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 6DB47C433EF for ; Fri, 28 Jan 2022 20:40:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351440AbiA1UkN (ORCPT ); Fri, 28 Jan 2022 15:40:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:28342 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344437AbiA1Ujr (ORCPT ); Fri, 28 Jan 2022 15:39:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402387; 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=ht4TIlDcHgebbMTmRHom2WWk1vPWsK5LmrKtQWe+Ves=; b=YqpLryaCmZ1O+eT8pq87819AzYrLe285sX+qVWYu4L/y1tbAOFoLS70lqhx38WJAdkv3Fm 0j3i4bzULye4FHHTPYvefdVECQ+WMuYSed5FhO93JzDsrqCB9J+XY4Totr4EvgC7Bvt1Va B7FzEDpKLTmUQcWZ29bMpAkVbukDRCU= 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-465-xEUXT96IM_WXIhDMxwbmUQ-1; Fri, 28 Jan 2022 15:39:46 -0500 X-MC-Unique: xEUXT96IM_WXIhDMxwbmUQ-1 Received: by mail-wm1-f71.google.com with SMTP id o194-20020a1ca5cb000000b00350b177fb22so5663579wme.3 for ; Fri, 28 Jan 2022 12:39:45 -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=ht4TIlDcHgebbMTmRHom2WWk1vPWsK5LmrKtQWe+Ves=; b=gFQDCe3hSadBoaoKWVHKTq8nlRxuZFD+mizZI0CD+NbFEqROTOaOHh8VfYrWXKeiGj /KgP2JgHL1+Ph2Tmm1qkcidMTn1Y6LSWgXeqUFqjHjeVeuhlBKO6R/toBzTdbu08cFgI 8uYULNxaQXDwq95Oet8wj6K5VyHhxDAuUsowUrPtCFttLbDIis9+Z/csJKp/p0Xg+X59 mGixThYr6GI40L5nG1895iXLcmrAHDgSs3WMwkESnXcrBPQWNnl5fsoJOO7oBtYy4MRt RyMDbrHxw4nHHkSrKam6N7Y4hBBQ+76IoTJbxN1Ea6IQ5zZf8VEizk5ump2vpwvfa9ut 0mhQ== X-Gm-Message-State: AOAM533gINGmI6A91Ue8t476HrWjUySfkN8twdqg7b6OgADPPBFgEg9y vTWzZ6Ncg8kC17eEwXWJ+3uURxbcbtNkVVJjB0Jii2dxCpj46X4DI6TW0Ke1lmA5btIlFMJuvFU aeVdq02x3ErlssAcbiPxZO5A= X-Received: by 2002:a05:600c:3b2a:: with SMTP id m42mr17175249wms.58.1643402384755; Fri, 28 Jan 2022 12:39:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsPYXDh8KcoCnxc2Q7JY8QjTh6O903oitK5a0y8Rf+i5qqBNxYbWA9fluteKxP0ATcAIXkxw== X-Received: by 2002:a05:600c:3b2a:: with SMTP id m42mr17175232wms.58.1643402384555; Fri, 28 Jan 2022 12:39:44 -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 b15sm5248133wrs.93.2022.01.28.12.39.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:44 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 07/13] module: Move extra signature support out of core code Date: Fri, 28 Jan 2022 20:39:28 +0000 Message-Id: <20220128203934.600247-8-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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. Signed-off-by: Aaron Tomlin --- include/linux/module.h | 5 ++- kernel/module/internal.h | 9 +++++ kernel/module/main.c | 87 ---------------------------------------- kernel/module/signing.c | 75 ++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 89 deletions(-) diff --git a/include/linux/module.h b/include/linux/module.h index 7bf93c0d87e6..68dabc036100 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -758,8 +758,8 @@ static inline bool set_livepatch_module(struct module *= mod) } #endif /* CONFIG_LIVEPATCH */ =20 -bool is_module_sig_enforced(void); -void set_module_sig_enforced(void); +extern bool is_module_sig_enforced(void); +extern void set_module_sig_enforced(void); =20 #else /* !CONFIG_MODULES... */ =20 @@ -949,6 +949,7 @@ static inline bool module_sig_ok(struct module *module) { return true; } +#define sig_enforce false #endif /* CONFIG_MODULE_SIG */ =20 int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, diff --git a/kernel/module/internal.h b/kernel/module/internal.h index 0cd624179545..5aab87716d9f 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -80,3 +80,12 @@ static inline void module_decompress_cleanup(struct load= _info *info) { } #endif + +#ifdef CONFIG_MODULE_SIG +extern int module_sig_check(struct load_info *info, int flags); +#else /* !CONFIG_MODULE_SIG */ +static 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 4f590b0c7aca..36ed4dd64cac 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -114,28 +113,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); @@ -2516,70 +2493,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..ff41541e982a 100644 --- a/kernel/module/signing.c +++ b/kernel/module/signing.c @@ -11,9 +11,28 @@ #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 +62,59 @@ 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; + + /* + * Require flags =3D=3D 0, as a module with version information + * removed is no longer the module that was signed + */ + if (flags =3D=3D 0 && + 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 30 00:47:01 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 317D1C433F5 for ; Fri, 28 Jan 2022 20:40:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344500AbiA1UkQ (ORCPT ); Fri, 28 Jan 2022 15:40:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:30992 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344515AbiA1Ujt (ORCPT ); Fri, 28 Jan 2022 15:39:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402388; 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=NsAIYrsaMFdioppTbSAD/oCtDYtbz/3oa7wgYDL+PvU=; b=E9PdFAS0784h9hRA7hPuz/6I46MhCRU+c47zoOrJGNiSI1VOiuVCgO8HrxKeNVwZhFIj1w rKbhqQtLQocQXSTfsx9OJRDiPUGj1gDlAFSQR313gaOjWPNDzkRs0YjdL1de5an4ijBmmk Vfxxs4l2rkVn3CD8/acot+X6mQYv18E= 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-451-XjLINWNtOlS8bfw1UhoZ0g-1; Fri, 28 Jan 2022 15:39:46 -0500 X-MC-Unique: XjLINWNtOlS8bfw1UhoZ0g-1 Received: by mail-wm1-f72.google.com with SMTP id o194-20020a1ca5cb000000b00350b177fb22so5663601wme.3 for ; Fri, 28 Jan 2022 12:39:46 -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=NsAIYrsaMFdioppTbSAD/oCtDYtbz/3oa7wgYDL+PvU=; b=uqdVu2WckGWM3UzOdaXUsLMoV5SxDGg706xyHiL4qvZ66GL4XKLaSR6nRxBVnMeEKK xLZ1SgnjEqsp0bPcG1fli3ti/MFpMIDWXPME/RZ+AKa1ERleoIKp4g0OPIgbEfoXANyv GQNiLhV7AtHeN+q5zis+E6Drfa3QsX9QQDwPoakMXwzG7UB4kUeRDJSbfZ3nE1AK3pA5 JODWIErLjH4a0T+pwO9IA/lj9WeJ/DZ72v/Z/ORs7reIGhSFwuOdgfDjDBu78zKiBhqC Ru3R29iJd81BqXK/GDf9NtaGod8dsovelFlCV31p8FIaNWbmvkGNQXOoFg4NlT4jcwTh KD2g== X-Gm-Message-State: AOAM533wS7TquktN5dvTJNYs4jCk0sWoNTGNKRydDGYNItdnVEHL2bX7 JcJSD7n3Ni4S/xyQmQIkiOvmUb+Y4GewlRO2auEE6dbCGyK8SWEOydV+NzN0aWoMsPyYPC5G3dt VIbQVliaZ9cwryLKAwbxFMmo= X-Received: by 2002:a5d:500c:: with SMTP id e12mr8394474wrt.219.1643402385773; Fri, 28 Jan 2022 12:39:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJylzjcgZDoD96Qm8ciNhcI7xY4BI+En+zUfdeeoKuCa44n6yGgIy3KnBjrReliOeKPRyvJFcw== X-Received: by 2002:a5d:500c:: with SMTP id e12mr8394460wrt.219.1643402385645; Fri, 28 Jan 2022 12:39:45 -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 1sm2702409wmo.37.2022.01.28.12.39.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:45 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 08/13] module: Move kmemleak support to a separate file Date: Fri, 28 Jan 2022 20:39:29 +0000 Message-Id: <20220128203934.600247-9-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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 Signed-off-by: Aaron Tomlin --- kernel/module/Makefile | 1 + kernel/module/debug_kmemleak.c | 30 ++++++++++++++++++++++++++++++ kernel/module/internal.h | 8 ++++++++ kernel/module/main.c | 27 --------------------------- 4 files changed, 39 insertions(+), 27 deletions(-) create mode 100644 kernel/module/debug_kmemleak.c diff --git a/kernel/module/Makefile b/kernel/module/Makefile index c4198fcf4772..3901f0713f22 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -11,3 +11,4 @@ obj-$(CONFIG_LIVEPATCH) +=3D livepatch.o obj-$(CONFIG_MODULES_TREE_LOOKUP) +=3D tree_lookup.o obj-$(CONFIG_ARCH_HAS_STRICT_MODULE_RWX) +=3D arch_strict_rwx.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..e896c2268011 --- /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 5aab87716d9f..ef9513070b88 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -6,6 +6,7 @@ */ =20 #include +#include #include #include =20 @@ -89,3 +90,10 @@ static int module_sig_check(struct load_info *info, int = flags) return 0; } #endif /* !CONFIG_MODULE_SIG */ + +#ifdef CONFIG_DEBUG_KMEMLEAK +extern void kmemleak_load_module(const struct module *mod, const struct lo= ad_info *info); +#else /* !CONFIG_DEBUG_KMEMLEAK */ +static inline void __maybe_unused 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 36ed4dd64cac..6fb1c885d9c2 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2466,33 +2466,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 30 00:47:01 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 8FD03C433F5 for ; Fri, 28 Jan 2022 20:40:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351498AbiA1UkY (ORCPT ); Fri, 28 Jan 2022 15:40:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51318 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351221AbiA1Ujv (ORCPT ); Fri, 28 Jan 2022 15:39:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402390; 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=ztYLMCWn1dPANvgGtGGkSWSX2cCxZreI1fPFFPoHpZo=; b=ORlgwh0pA2fuPzTL52Jm/9BR022Kyso6J8OUMTND+gzeRaIoA/lSDbhkzyS4MBg1kIylUo 9gAKlhVZBiPPpJECwqH8hoa2of2uwwE2IIbTUiOV/8UtpP35jPIl7EiCboxcg4ol8/lvQM Q0qKc3HOnZLr5N+OmP5uE9ledIalSeY= 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-116-BqSmVL0VPJeJRffEPb-X5g-1; Fri, 28 Jan 2022 15:39:49 -0500 X-MC-Unique: BqSmVL0VPJeJRffEPb-X5g-1 Received: by mail-wm1-f69.google.com with SMTP id l16-20020a1c7910000000b0034e4206ecb7so3451129wme.7 for ; Fri, 28 Jan 2022 12:39:48 -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=ztYLMCWn1dPANvgGtGGkSWSX2cCxZreI1fPFFPoHpZo=; b=niIeJ3kQdPVh9zz9/KDKLRkKe6iXII5oWnjcO+JMnCQX2aG9EM3ZiAgJkiUb9qGiGo Pvek48MMXdkjQcI57khJsAW9poawNWVsSVz9nAKN+8gBocleDn+1+kIQsigYqpMnqYgJ BtmG9SgHxJIU2KP0piOBe5bC0wsukqY1vOhOjnGnIdTcM3R9iOhDDm0YkpQdkOZH3UeI u577IbYLGuEVKMKDqi1Au9hg7gbBENT5dxOMtG6XSV3FOw6vlObv0jYrc33xCqIx6rOn eAyJN0ly1JecDIC0Y7cyDESrkUEUlx+G93a/mm2O0X+JaNqbW3vz4CurFGkhbH4nJ3f2 O3tg== X-Gm-Message-State: AOAM530g2R/lvNbVkblg7KHEUyl2WpSx32MfU7p9WAi3kkF/H3huz4qm IssVgTTLvy85cGYrfuwApVXCtjLic0dvoefnMPRk4lveLdw4xvx6qtEXnBd2qCEuk66k7OmbK2J YYCYikQ8yLIis+P98aLw8LGM= X-Received: by 2002:a5d:410a:: with SMTP id l10mr8374366wrp.390.1643402387184; Fri, 28 Jan 2022 12:39:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/BZr+r2RGRFnwJsWu1+tOJVtw+kHIb89jiFOva4HA2bF+vtu5687kxixFY3BwhZrg9E4MRQ== X-Received: by 2002:a5d:410a:: with SMTP id l10mr8374353wrp.390.1643402386739; Fri, 28 Jan 2022 12:39:46 -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 t5sm5619340wrw.92.2022.01.28.12.39.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:46 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 09/13] module: Move kallsyms support into a separate file Date: Fri, 28 Jan 2022 20:39:30 +0000 Message-Id: <20220128203934.600247-10-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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 | 27 ++ kernel/module/kallsyms.c | 502 +++++++++++++++++++++++++++++++++++++ kernel/module/main.c | 516 +-------------------------------------- 4 files changed, 534 insertions(+), 512 deletions(-) create mode 100644 kernel/module/kallsyms.c diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 3901f0713f22..5fb2a7fec743 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -12,3 +12,4 @@ obj-$(CONFIG_MODULES_TREE_LOOKUP) +=3D tree_lookup.o obj-$(CONFIG_ARCH_HAS_STRICT_MODULE_RWX) +=3D arch_strict_rwx.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 ef9513070b88..e69d0249df6b 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -57,6 +57,11 @@ struct load_info { }; =20 extern int mod_verify_sig(const void *mod, struct load_info *info); +extern struct module *find_module_all(const char *name, size_t len, bool e= ven_unformed); +extern unsigned long kernel_symbol_value(const struct kernel_symbol *sym); +extern int cmp_name(const void *name, const void *sym); +extern long get_offset(struct module *mod, unsigned int *size, Elf_Shdr *s= echdr, + unsigned int section); =20 #ifdef CONFIG_LIVEPATCH extern int copy_module_elf(struct module *mod, struct load_info *info); @@ -97,3 +102,25 @@ extern void kmemleak_load_module(const struct module *m= od, const struct load_inf static inline void __maybe_unused kmemleak_load_module(const struct module= *mod, const struct load_info *info) { } #endif /* CONFIG_DEBUG_KMEMLEAK */ + +#ifdef CONFIG_KALLSYMS +#ifdef CONFIG_STACKTRACE_BUILD_ID +extern void init_build_id(struct module *mod, const struct load_info *info= ); +#else /* !CONFIG_STACKTRACE_BUILD_ID */ +static inline void init_build_id(struct module *mod, const struct load_inf= o *info) { } + +#endif +extern void layout_symtab(struct module *mod, struct load_info *info); +extern void add_kallsyms(struct module *mod, const struct load_info *info); +extern bool sect_empty(const Elf_Shdr *sect); +extern const char *find_kallsyms_symbol(struct module *mod, unsigned long = addr, + unsigned long *size, unsigned long *offset); +#else /* !CONFIG_KALLSYMS */ +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) { } +static inline char *find_kallsyms_symbol(struct module *mod, unsigned long= addr, + unsigned long *size, unsigned long *offset) +{ + return NULL; +} +#endif /* CONFIG_KALLSYMS */ diff --git a/kernel/module/kallsyms.c b/kernel/module/kallsyms.c new file mode 100644 index 000000000000..ed28f6310701 --- /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 !=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>. + */ +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. + */ +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 strscpy(s, &mod->kallsyms->strtab[src[i].st_name], + KSYM_NAME_LEN) + 1; + } + } + mod->core_kallsyms.num_symtab =3D ndst; +} + +inline bool sect_empty(const Elf_Shdr *sect) +{ + return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size =3D=3D 0; +} + +#ifdef 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; + } +} +#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. + */ +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; + + 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 */ +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; + } + } +out: + mutex_unlock(&module_mutex); + return ret; +} +#endif /* CONFIG_LIVEPATCH */ diff --git a/kernel/module/main.c b/kernel/module/main.c index 6fb1c885d9c2..054f34de4e6c 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -275,7 +275,7 @@ static bool check_exported_symbol(const struct symsearc= h *syms, return true; } =20 -static unsigned long kernel_symbol_value(const struct kernel_symbol *sym) +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); @@ -304,7 +304,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)); } @@ -374,7 +374,7 @@ 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, +struct module *find_module_all(const char *name, size_t len, bool even_unformed) { struct module *mod; @@ -1281,13 +1281,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 @@ -2012,7 +2005,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 get_offset(struct module *mod, unsigned int *size, Elf_Shdr *sechdr, unsigned int section) { long ret; @@ -2214,228 +2207,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) @@ -3761,285 +3532,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; - } - } -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 30 00:47:01 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 B83B0C433F5 for ; Fri, 28 Jan 2022 20:40:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351459AbiA1UkT (ORCPT ); Fri, 28 Jan 2022 15:40:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45424 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351235AbiA1Ujv (ORCPT ); Fri, 28 Jan 2022 15:39:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402390; 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=4UutzblsRtlwsSIBw9v5cxXxwTK2wKu3GWBji/jS7FY=; b=R60PrUp9wnWy69K3WoccoOd1VAbUnw1tkCbbZC3MC2+TqVog/xC5stJRHmSByPrYV4UKGx WcrqbSuIDi7vEsMnN85hclX0QRvstFdl6ovpiTTK0q4NDegCMZlCwdYWp8P86F5qLywYs4 JtJUke/o3rwtRPHWDnqIP95kozjp6OI= 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-6-ozzmJJghMduwv5xa5lCJIg-1; Fri, 28 Jan 2022 15:39:49 -0500 X-MC-Unique: ozzmJJghMduwv5xa5lCJIg-1 Received: by mail-wm1-f72.google.com with SMTP id m3-20020a7bcb83000000b0034f75d92f27so3469884wmi.2 for ; Fri, 28 Jan 2022 12:39:49 -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=4UutzblsRtlwsSIBw9v5cxXxwTK2wKu3GWBji/jS7FY=; b=02/BtuPRc+Nff4yCcj0tjMmZaT+lsOpCeEZrVmHEaUXdoprzrLJLu7FfLC372RJIrV RAJEksA7h9wNOqzCCBaoehPWpOtZKh+jF6dfReQ+sxeAYUnui3Gmf2HzB23S+flcMq5r Ps2vzWkfJRJVozA5j/MKqN2Sa0ULVKvdPnZQlOJc+XH3PNxtbyHu3yF/22NI59eazZ1i uNrmeSnhtQpi/Z4qLCaAKEZhGp+Ammp/ST2lqBJgWoVRNbuj/eGvB5eK45k7fFprDhiM V1O9PqLSLAtwi0p7MjJu7+4qhigPK0dif8QudPZjGuchPhlJDBeG/9GwdU+jGW9efBWu pZpQ== X-Gm-Message-State: AOAM5326WHjY6VbBQadT8xKnE8CkAPi2C1ILsQV4wDrh5b3uFs/d44vZ lGde1bzd15PijRxuKOdpkj7thtizJagasI+1qGPT/+qdTvTp3MhsMdVKZBHzoZE0YqrkbGDZqZi 4L3Y5tl/n9XUSr2xT/Yegt3o= X-Received: by 2002:a7b:c841:: with SMTP id c1mr9197819wml.136.1643402387999; Fri, 28 Jan 2022 12:39:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbhXFD9+uUZOaU2eHkrclCDK1bo8bkMvWpLT6uedjjPQVDj2+JeXdIXfMTUWVf6tweh8CYkg== X-Received: by 2002:a7b:c841:: with SMTP id c1mr9197803wml.136.1643402387705; Fri, 28 Jan 2022 12:39:47 -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 r2sm8078890wrz.99.2022.01.28.12.39.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:47 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 10/13] module: Move procfs support into a separate file Date: Fri, 28 Jan 2022 20:39:31 +0000 Message-Id: <20220128203934.600247-11-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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. 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 5fb2a7fec743..f821903e2c5d 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -13,3 +13,4 @@ obj-$(CONFIG_ARCH_HAS_STRICT_MODULE_RWX) +=3D arch_strict= _rwx.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 e69d0249df6b..a067107c97bc 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -62,6 +62,7 @@ extern unsigned long kernel_symbol_value(const struct ker= nel_symbol *sym); extern int cmp_name(const void *name, const void *sym); extern long get_offset(struct module *mod, unsigned int *size, Elf_Shdr *s= echdr, unsigned int section); +extern char *module_flags(struct module *mod, char *buf); =20 #ifdef CONFIG_LIVEPATCH extern int copy_module_elf(struct module *mod, struct load_info *info); diff --git a/kernel/module/main.c b/kernel/module/main.c index 054f34de4e6c..78389be0eb5f 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -801,31 +800,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 { @@ -915,12 +889,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) { } @@ -3567,7 +3535,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 @@ -3590,103 +3558,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..d706a798b52e --- /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 !=3D NULL && mod->exit =3D=3D NULL) { + 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 30 00:47:01 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 4531EC433EF for ; Fri, 28 Jan 2022 20:40:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351546AbiA1Ukn (ORCPT ); Fri, 28 Jan 2022 15:40:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33853 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351290AbiA1Ujx (ORCPT ); Fri, 28 Jan 2022 15:39:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402393; 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=2ilp+N1TCwJYn+h2+6rS6wF+kSX/LkRieDAJJSPUcbk=; b=O/MzTFgYxTIK1ZkAT0+xub6bHds41MN8Un3MeVQfQ/69Zqj17sV9jCvAoVpNPl8l7D/4Iy /sX2Csc5kgqN/s5vwNSD7CZ7HhOA1UCnJ3sk7wouWQEyv+Nl9Wtka5VuNnDfo9AoBHeaYc ZqzWo8JbfdCDKV13v2iZpJQ/QoJWLy0= 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-586-1-O0LQ86N-CMiTI3_EJ5Ng-1; Fri, 28 Jan 2022 15:39:51 -0500 X-MC-Unique: 1-O0LQ86N-CMiTI3_EJ5Ng-1 Received: by mail-wm1-f69.google.com with SMTP id j18-20020a05600c1c1200b0034aeea95dacso6416764wms.8 for ; Fri, 28 Jan 2022 12:39:51 -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=2ilp+N1TCwJYn+h2+6rS6wF+kSX/LkRieDAJJSPUcbk=; b=1gwWW2SqpYqW9id5Oig70i0neZw/+QCwYWFM6dT6lDK4bnCFeiGFKGV9efiEdCGxlA nEjTbQV98dh4KlFYstl2+gss+H49eEq2/B970+78SQF35fvp75YzKvIi31hIZxUglCUZ l8dx9N5WxKfwOmOF8yIVMPwOfaDg4OPvUDSnpW+DEVPe5bVVCN97j6jyDsgSB1Ut/qF3 oaJLAAChQOI00KQupfNxtdJKzDFcuOtqRQyLGY2O5LcfG3N+4egv62ixsnFDOUjxA4qu n/8IS3o/2zfdpwZ1hFmZGTsdRSwkjTWLUao4Vt5Q9GeSVjnbDodpvCJpOcCpnQqGfjC1 9MuQ== X-Gm-Message-State: AOAM530suUPpEwxnV8BSGWlTIc58Xg3bO8K0HkGOKtyQRcFKhM+hqMW6 XBGUpINfc4X4RdCOBcCpeEqeortGMHDSKAv1oxkGEqnb1+Xntz+cTP+5/KbJv0AtQnvZoOlHVCc XggHctR0wmJiMgq/13EppHJ8= X-Received: by 2002:adf:cd85:: with SMTP id q5mr8424857wrj.450.1643402389706; Fri, 28 Jan 2022 12:39:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDtkzDf1u6KtFGtIGoQCqCamhmW4nZzVVeP3np8ZvLDfulKm/4AgjW2xG4zkgaEHzZeI8k3g== X-Received: by 2002:adf:cd85:: with SMTP id q5mr8424835wrj.450.1643402389338; Fri, 28 Jan 2022 12:39:49 -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 44sm5388865wrm.103.2022.01.28.12.39.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:48 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 11/13] module: Move sysfs support into a separate file Date: Fri, 28 Jan 2022 20:39:32 +0000 Message-Id: <20220128203934.600247-12-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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. Signed-off-by: Aaron Tomlin --- kernel/module/Makefile | 1 + kernel/module/internal.h | 24 ++ kernel/module/main.c | 458 +-------------------------------------- kernel/module/sysfs.c | 425 ++++++++++++++++++++++++++++++++++++ 4 files changed, 453 insertions(+), 455 deletions(-) create mode 100644 kernel/module/sysfs.c diff --git a/kernel/module/Makefile b/kernel/module/Makefile index f821903e2c5d..44b9b4924d71 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -14,3 +14,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 a067107c97bc..bf2746949e93 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -23,6 +23,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[]; @@ -125,3 +128,24 @@ static inline char *find_kallsyms_symbol(struct module= *mod, unsigned long addr, return NULL; } #endif /* CONFIG_KALLSYMS */ + +#ifdef CONFIG_SYSFS +extern int mod_sysfs_setup(struct module *mod, const struct load_info *inf= o, + struct kernel_param *kparam, unsigned int num_params); +extern void mod_sysfs_fini(struct module *mod); +extern void module_remove_modinfo_attrs(struct module *mod, int end); +extern void del_usage_links(struct module *mod); +extern void init_param_lock(struct module *mod); +#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 inline void mod_sysfs_fini(struct module *mod) { } +static inline void module_remove_modinfo_attrs(struct module *mod, int end= ) { } +static inline void del_usage_links(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 78389be0eb5f..574cba3e0418 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -13,9 +13,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -985,7 +983,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, @@ -999,6 +997,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) @@ -1249,458 +1249,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[]; -}; - -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); diff --git a/kernel/module/sysfs.c b/kernel/module/sysfs.c new file mode 100644 index 000000000000..f5c72c567e71 --- /dev/null +++ b/kernel/module/sysfs.c @@ -0,0 +1,425 @@ +// 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[]; +}; + +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 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 */ + +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 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; +} + +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; +} + +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; +} + +void mod_sysfs_fini(struct module *mod) +{ + remove_notes_attrs(mod); + remove_sect_attrs(mod); + mod_kobject_put(mod); +} + +void init_param_lock(struct module *mod) +{ + mutex_init(&mod->param_lock); +} --=20 2.34.1 From nobody Tue Jun 30 00:47:01 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 53352C433F5 for ; Fri, 28 Jan 2022 20:40:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351527AbiA1Ukg (ORCPT ); Fri, 28 Jan 2022 15:40:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:22887 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344412AbiA1Ujy (ORCPT ); Fri, 28 Jan 2022 15:39:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402394; 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=Cvfn0bVpP3Fi5CVaGokDyVZniSa+9b2/16mV0usiezg=; b=Cl7laL25EoRXtcUrIuu+mm2Cjra5JeIbawhFsaOhPALcNuk8R0AUQBXVWH03mFT4tNmmMQ UY0OWSrrplOICPZskKkdlUz0TrQrQHw3UiW/PK1QE0MH05RQymKoQnAuM4fgFs8huMhWqM nfwOzWnTTr1QelAuaUASYb3gyffpXNs= 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-613-LmsYUS-vNhi_-urxx4ekxw-1; Fri, 28 Jan 2022 15:39:53 -0500 X-MC-Unique: LmsYUS-vNhi_-urxx4ekxw-1 Received: by mail-wm1-f70.google.com with SMTP id o3-20020a1ca503000000b0035056b042deso3489485wme.0 for ; Fri, 28 Jan 2022 12:39:53 -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=Cvfn0bVpP3Fi5CVaGokDyVZniSa+9b2/16mV0usiezg=; b=cpLfvHMRbuUW13cP5G4mbQOYoFhcvTDmS1x2N2BOxW7Yupy5esxV3nQAqRE7eZgyEy xcDvdGbJKnxPaLSWI7QejNEEipNKezXV4giV9GtZDAL98itSnpbjtftTBzXIZqnmSkM4 //4+qgrQU1F4vZ32nAxD0Jkzq+SldaTYi5SFb5GMcCujU3RgHVcQ2jyUjzewQiHcVP9+ iNFwohJwbk/vN6rzU3+Efv3EbCKMswekXkG4V3SnG40g1U8/QtkTZMlXL64HHoIq7oJq E1zkkplTbw/fN5vyGqP79iTdu+1Dk8xV03YkYmxPTJFOxdefdGG0rzxMe/nX4qX0+vTn 3vjg== X-Gm-Message-State: AOAM531cgE+uG300+G9NkH4JqSAeXwcJ2ITRUz3CjKfFOUmBoAF0R7NK ZID3KjKxjy/DQ3LzYUOBSXAQAg7L92CT8sh61/fV7obrjOATd6c8g3n1ho/MYtK3mERAqmbTpfj CZPLlphIlOnf1x8BbRN4RbiI= X-Received: by 2002:a05:600c:298:: with SMTP id 24mr17147961wmk.100.1643402392128; Fri, 28 Jan 2022 12:39:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwb+wzu/hLRoeXjm/y3t8LcvyRcltKIrNu92Ny5zltolnetF6p7wW8V6BSuucGgTUuwWffimQ== X-Received: by 2002:a05:600c:298:: with SMTP id 24mr17147947wmk.100.1643402391944; Fri, 28 Jan 2022 12:39:51 -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 t5sm5619441wrw.92.2022.01.28.12.39.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:49 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 12/13] module: Move kdb_modules list out of core code Date: Fri, 28 Jan 2022 20:39:33 +0000 Message-Id: <20220128203934.600247-13-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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 kdb_modules list to core kdb code since the list of added/or loaded modules is no longer private. Signed-off-by: Aaron Tomlin --- kernel/debug/kdb/kdb_main.c | 5 +++++ kernel/module/main.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index 0852a537dad4..f101f5f078f4 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -59,6 +59,11 @@ EXPORT_SYMBOL(kdb_grepping_flag); int kdb_grep_leading; int kdb_grep_trailing; =20 +#ifdef CONFIG_MODULES +extern struct list_head modules; +struct list_head *kdb_modules =3D &modules; /* kdb needs the list of modul= es */ +#endif /* CONFIG_MODULES */ + /* * Kernel debugger state flags */ diff --git a/kernel/module/main.c b/kernel/module/main.c index 574cba3e0418..1f16e67f687f 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -95,10 +95,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 30 00:47:01 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 C5546C433F5 for ; Fri, 28 Jan 2022 20:40:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351586AbiA1Uk5 (ORCPT ); Fri, 28 Jan 2022 15:40:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22274 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232401AbiA1Uj4 (ORCPT ); Fri, 28 Jan 2022 15:39:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643402395; 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=oIuGCKEhKJ0rfok+3CzzqJj1VmBNcHrM7R91RoSbBf4=; b=HURYE+jQ3ZWbD8guDeTSv4Ed/jlMTtjWyOS5LXTyfxM4xF+5OEv49vPGPupa6iJqqBv0uv U8qSF0La5nIKY3DWqo67+A4lnuTS6PbTHk7UK6m7E4dQiWpdeUDfIvoy80aJV1LtRJJHwB EILGNqpzVwUAxiv3itI0BgKSkGTXc5k= 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-468-iiIeOfUmNgOeIJZh-UNObA-1; Fri, 28 Jan 2022 15:39:54 -0500 X-MC-Unique: iiIeOfUmNgOeIJZh-UNObA-1 Received: by mail-wm1-f71.google.com with SMTP id l16-20020a7bcf10000000b0034ffdd81e7aso3463177wmg.4 for ; Fri, 28 Jan 2022 12:39:54 -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=oIuGCKEhKJ0rfok+3CzzqJj1VmBNcHrM7R91RoSbBf4=; b=0KW4FQcw8YTUo8wChF1QxaSORf6Q4uq+/5OB1bf7R6QKTKoBbqfzrAHlcXhQxnIKqz qBwbDEWvySxozn6YHPg2Mk5ZnQZDfVelz34xzwh1IFswQJpb0YDJUDnTul9eEfNzoSDr YjfDVOKYIhki81W3rxUwNC5JntwGzWLjCr/RMaibB8g/8QPu4rz7wSQlD0fl35d8DJnX SSHZqjHIomDq4ubHcXvnEL8StGHx7Wa/PlaO8bM4OjfDBHyGpl460+QXzkBgWsAJUUUz mTQYeGnn5K35IhlzbIFPMDTHSLNGdptmZ0MSxixlk9g6eeOpaXuFwf2tcoyGr/Hjzg9M UjlQ== X-Gm-Message-State: AOAM532U4OxtKs2HteEfDEGCGIOMNGnNvK7aOYP0YGc9DXe0OzeLUCQP 6amIrIrK8DNDQ5WHhVVx69ZjprRAh509BQFbRVDEvRchHVULoeao3qvvlcIrb4JMXBGBGTteHV9 eJZt2OhzQ5i3WTxk6elj5wtI= X-Received: by 2002:a05:6000:184c:: with SMTP id c12mr8062470wri.388.1643402393319; Fri, 28 Jan 2022 12:39:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJyIGqq2vfwnVZdpWgko/zZy8zCcphccPJeJWTP0SY1PFuMr0RUTmN/3jqnJJRw2GWOw1tInig== X-Received: by 2002:a05:6000:184c:: with SMTP id c12mr8062454wri.388.1643402393062; Fri, 28 Jan 2022 12:39:53 -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 w6sm2614345wmi.15.2022.01.28.12.39.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 12:39:52 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, live-patching@vger.kernel.org, atomlin@atomlin.com, ghalat@redhat.com, allen.lkml@gmail.com Subject: [RFC PATCH v3 13/13] module: Move version support into a separate file Date: Fri, 28 Jan 2022 20:39:34 +0000 Message-Id: <20220128203934.600247-14-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128203934.600247-1-atomlin@redhat.com> References: <20220128203934.600247-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. Signed-off-by: Aaron Tomlin --- kernel/module/Makefile | 1 + kernel/module/internal.h | 51 +++++++++++++ kernel/module/main.c | 150 +-------------------------------------- kernel/module/version.c | 110 ++++++++++++++++++++++++++++ 4 files changed, 164 insertions(+), 148 deletions(-) create mode 100644 kernel/module/version.c diff --git a/kernel/module/Makefile b/kernel/module/Makefile index 44b9b4924d71..8b88ae28e714 100644 --- a/kernel/module/Makefile +++ b/kernel/module/Makefile @@ -15,3 +15,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_MODVERSIONS) +=3D version.o diff --git a/kernel/module/internal.h b/kernel/module/internal.h index bf2746949e93..94c6cfddf0a2 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -59,7 +59,31 @@ struct load_info { } index; }; =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; +}; + extern int mod_verify_sig(const void *mod, struct load_info *info); +extern int try_to_force_load(struct module *mod, const char *reason); +extern bool find_symbol(struct find_symbol_arg *fsa); extern struct module *find_module_all(const char *name, size_t len, bool e= ven_unformed); extern unsigned long kernel_symbol_value(const struct kernel_symbol *sym); extern int cmp_name(const void *name, const void *sym); @@ -149,3 +173,30 @@ static inline void module_remove_modinfo_attrs(struct = module *mod, int end) { } static inline void del_usage_links(struct module *mod) { } static inline void init_param_lock(struct module *mod) { } #endif /* CONFIG_SYSFS */ + +#ifdef CONFIG_MODVERSIONS +extern int check_version(const struct load_info *info, + const char *symname, struct module *mod, const s32 *crc); +extern int check_modstruct_version(const struct load_info *info, struct mo= dule *mod); +extern int same_magic(const char *amagic, const char *bmagic, bool has_crc= s); +#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 1f16e67f687f..0a1bd11d2a6e 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -231,28 +231,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) @@ -323,7 +301,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, @@ -997,7 +975,7 @@ size_t modinfo_attrs_count =3D ARRAY_SIZE(modinfo_attrs= ); =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)) @@ -1009,115 +987,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); @@ -3229,18 +3098,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..6a2c9ae1c5c5 --- /dev/null +++ b/kernel/module/version.c @@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Module version support + * + * Copyright (C) 2008 Rusty Russell + */ + +#include +#include +#include +#include "internal.h" + +/* + * 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); + +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; +} + +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. */ +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; +} --=20 2.34.1