module: core code clean up
Subsystems (3)
v7 cover module: core code clean up
Hi Luis,
As per your suggestion [1], this is an attempt to refactor and split optional code out of core module support code into separate components. This version is based on Linus' commit 7993e65fdd0f ("Merge tag 'mtd/fixes-for-5.17-rc5' ofgit://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux").
Hi Christophe,
Hopefully this iteration is all right.
Please let me know your thoughts.
Changes since v6 [2]
- Moved KCOV_INSTRUMENT_module.o out of kernel/Makefile into kernel/module/Makefile (Christophe Leroy)
- Moved kernel/module/signature.c back into kernel/ (Christophe Leroy)
- Fixed Oops in add_kallsyms() due to an invalid pointer assignment (Christophe Leroy)
Changes since v5 [3]:
- Updated MAINTAINERS to include the entire kernel/module/ directory (Christophe Leroy)
- Reintroduce commit a97ac8cb24a3 ("module: fix signature check failures when using in-kernel decompression") (Michal Suchánek)
- Refactored code to address some (i.e. --ignore=MULTIPLE_ASSIGNMENTS,ASSIGN_IN_IF was used) style violations e.g. "Alignment should match open parenthesis", reported by scripts/checkpatch.pl --strict (Christophe Leroy)
- Used PAGE_ALIGN() and PAGE_ALIGNED() instead (Christophe Leroy)
- Removed sig_enforce from include/linux/module.h as it is only used in kernel/module/signing.c (Christophe Leroy)
- Added static keyword for anything not used outside a source file (Christophe Leroy)
- Moved mod_sysfs_teardown() to kernel/module/sysfs.c (Christophe Leroy)
- Removed kdb_modules from kernel/debug/kdb/kdb_private.h (Christophe Leroy)
Changes since v4 [4]:
- Moved is_livepatch_module() and set_livepatch_module() to kernel/module/livepatch.c
- Addressed minor compiler warning concerning kernel/module/internal.h (0-day)
- Resolved style violations reported by scripts/checkpatch.pl
- Dropped patch 5 [5] so external patch [6] can be applied at a later date post merge into module-next (Christophe Leroy)
Changes since v3 [7]:
- Refactored both is_livepatch_module() and set_livepatch_module(), respectively, to use IS_ENABLED(CONFIG_LIVEPATCH) (Joe Perches)
- Addressed various compiler warnings e.g., no previous prototype (0-day)
Changes since v2 [8]:
- Moved module decompress support to a separate file
- Made check_modinfo_livepatch() generic (Petr Mladek)
- Removed filename from each newly created file (Luis Chamberlain)
- Addressed some (i.e. --ignore=ASSIGN_IN_IF,AVOID_BUG was used) minor scripts/checkpatch.pl concerns e.g., use strscpy over strlcpy and missing a blank line after declarations (Allen)
Changes since v1 [9]:
- Moved module version support code into a new file
[1]: https://lore.kernel.org/lkml/[email protected]/
[2]: https://lore.kernel.org/lkml/[email protected]/
[3]: https://lore.kernel.org/lkml/[email protected]/
[4]: https://lore.kernel.org/lkml/[email protected]/
[5]: https://lore.kernel.org/lkml/[email protected]/
[6]: https://lore.kernel.org/lkml/203348805c9ac9851d8939d15cb9802ef047b5e2.1643919758.git.christophe.leroy@csgroup.eu/
[7]: https://lore.kernel.org/lkml/[email protected]/
[8]: https://lore.kernel.org/lkml/[email protected]/
[9]: https://lore.kernel.org/lkml/[email protected]/
Aaron Tomlin (13):
module: Move all into module/
module: Simple refactor in preparation for split
module: Make internal.h and decompress.c more compliant
module: Move livepatch support to a separate file
module: Move latched RB-tree support to a separate file
module: Move strict rwx support to a separate file
module: Move extra signature support out of core code
module: Move kmemleak support to a separate file
module: Move kallsyms support into a separate file
module: Move procfs support into a separate file
module: Move sysfs support into a separate file
module: Move kdb_modules list out of core code
module: Move version support into a separate file
MAINTAINERS | 2 +-
include/linux/module.h | 9 +-
kernel/Makefile | 5 +-
kernel/debug/kdb/kdb_main.c | 5 +
kernel/debug/kdb/kdb_private.h | 4 -
kernel/module-internal.h | 50 -
kernel/module/Makefile | 22 +
kernel/module/debug_kmemleak.c | 30 +
.../decompress.c} | 5 +-
kernel/module/internal.h | 275 +++
kernel/module/kallsyms.c | 506 +++++
kernel/module/livepatch.c | 74 +
kernel/{module.c => module/main.c} | 1856 +----------------
kernel/module/procfs.c | 142 ++
kernel/module/signing.c | 122 ++
kernel/module/strict_rwx.c | 85 +
kernel/module/sysfs.c | 436 ++++
kernel/module/tree_lookup.c | 109 +
kernel/module/version.c | 109 +
kernel/module_signing.c | 45 -
20 files changed, 2009 insertions(+), 1882 deletions(-)
delete mode 100644 kernel/module-internal.h
create mode 100644 kernel/module/Makefile
create mode 100644 kernel/module/debug_kmemleak.c
rename kernel/{module_decompress.c => module/decompress.c} (99%)
create mode 100644 kernel/module/internal.h
create mode 100644 kernel/module/kallsyms.c
create mode 100644 kernel/module/livepatch.c
rename kernel/{module.c => module/main.c} (64%)
create mode 100644 kernel/module/procfs.c
create mode 100644 kernel/module/signing.c
create mode 100644 kernel/module/strict_rwx.c
create mode 100644 kernel/module/sysfs.c
create mode 100644 kernel/module/tree_lookup.c
create mode 100644 kernel/module/version.c
delete mode 100644 kernel/module_signing.cbase-commit: 7993e65fdd0fe07beb9f36f998f9bbef2c0ee391
Signature · 1 line
2.34.1
PATCH v7 1/13 module: Move all into module/
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.
---
MAINTAINERS | 2 +-
kernel/Makefile | 5 +----
kernel/module/Makefile | 12 ++++++++++++
kernel/{module_decompress.c => module/decompress.c} | 2 +-
kernel/{module-internal.h => module/internal.h} | 0
kernel/{module.c => module/main.c} | 2 +-
kernel/{module_signing.c => module/signing.c} | 2 +-
7 files changed, 17 insertions(+), 8 deletions(-)
create mode 100644 kernel/module/Makefile
rename kernel/{module_decompress.c => module/decompress.c} (99%)
rename kernel/{module-internal.h => module/internal.h} (100%)
rename kernel/{module.c => module/main.c} (99%)
rename kernel/{module_signing.c => module/signing.c} (97%)MAINTAINERS +1 -1
@@ -13012,7 +13012,7 @@ L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next F: include/linux/module.h -F: kernel/module.c +F: kernel/module/ MONOLITHIC POWER SYSTEM PMIC DRIVER M: Saravanan Sekar <[email protected]>
kernel/Makefile +1 -4
@@ -29,7 +29,6 @@ KCOV_INSTRUMENT_softirq.o := n KCSAN_SANITIZE_softirq.o = n # These are called from save_stack_trace() on slub debug path, # and produce insane amounts of uninteresting coverage. -KCOV_INSTRUMENT_module.o := n KCOV_INSTRUMENT_extable.o := n KCOV_INSTRUMENT_stacktrace.o := n # Don't self-instrument.
@@ -53,6 +52,7 @@ obj-y += rcu/ obj-y += livepatch/ obj-y += dma/ obj-y += entry/ +obj-$(CONFIG_MODULES) += module/ obj-$(CONFIG_KCMP) += kcmp.o obj-$(CONFIG_FREEZER) += freezer.o
@@ -66,9 +66,6 @@ ifneq ($(CONFIG_SMP),y) obj-y += up.o endif obj-$(CONFIG_UID16) += uid16.o -obj-$(CONFIG_MODULES) += module.o -obj-$(CONFIG_MODULE_DECOMPRESS) += module_decompress.o -obj-$(CONFIG_MODULE_SIG) += module_signing.o obj-$(CONFIG_MODULE_SIG_FORMAT) += module_signature.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
kernel/module/Makefile new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Makefile for linux kernel module support +# + +# These are called from save_stack_trace() on slub debug path, +# and produce insane amounts of uninteresting coverage. +KCOV_INSTRUMENT_module.o := n + +obj-y += main.o +obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o +obj-$(CONFIG_MODULE_SIG) += signing.o
kernel/module/decompress.c renamed from kernel/module_decompress.c +1 -1
@@ -12,7 +12,7 @@#include <linux/sysfs.h> #include <linux/vmalloc.h> -#include "module-internal.h" +#include "internal.h" static int module_extend_max_pages (struct load_info *info,unsigned int extent) {
kernel/module/internal.h renamed from kernel/module-internal.h +0 -0
kernel/module/main.c renamed from kernel/module.c +1 -1
@@ -58,7 +58,7 @@#include <linux/dynamic_debug.h> #include <linux/audit.h> #include <uapi/linux/module.h> -#include "module-internal.h" +#include "internal.h" #define CREATE_TRACE_POINTS #include <trace/events/module.h>
kernel/module/signing.c renamed from kernel/module_signing.c +1 -1
@@ -12,7 +12,7 @@#include <linux/string.h> #include <linux/verification.h> #include <crypto/public_key.h> -#include "module-internal.h" +#include "internal.h" /* * Verify the signature on a module.
Signature · 1 line
2.34.1
PATCH v7 2/13 module: Simple refactor in preparation for split
In reply to Aaron TomlinNo functional change.
This patch makes it possible to move non-essential code out of core module code.
--- kernel/module/internal.h | 21 +++++++++++++++++++++ kernel/module/main.c | 22 ++-------------------- 2 files changed, 23 insertions(+), 20 deletions(-)
kernel/module/internal.h +21 -0
@@ -7,6 +7,27 @@#include <linux/elf.h> #include <asm/module.h> +#include <linux/mutex.h> + +#ifndef ARCH_SHF_SMALL +#define ARCH_SHF_SMALL 0 +#endif + +/* If this is set, the section belongs in the init part of the module */ +#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG - 1)) +/* Maximum number of characters written by module_flags() */ +#define MODULE_FLAGS_BUF_SIZE (TAINT_FLAGS_COUNT + 4) + +extern struct mutex module_mutex; +extern struct list_head modules; + +/* Provided by the linker */ +extern const struct kernel_symbol __start___ksymtab[]; +extern const struct kernel_symbol __stop___ksymtab[]; +extern const struct kernel_symbol __start___ksymtab_gpl[]; +extern const struct kernel_symbol __stop___ksymtab_gpl[]; +extern const s32 __start___kcrctab[]; +extern const s32 __start___kcrctab_gpl[];struct load_info {const char *name;
kernel/module/main.c +2 -20
@@ -63,10 +63,6 @@#define CREATE_TRACE_POINTS #include <trace/events/module.h> -#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 -/* 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);/* 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 struct load_info *info,return (void *)info->sechdrs[sec].sh_addr; } -/* Provided by the linker */ -extern const struct kernel_symbol __start___ksymtab[]; -extern const struct kernel_symbol __stop___ksymtab[]; -extern const struct kernel_symbol __start___ksymtab_gpl[]; -extern const struct kernel_symbol __stop___ksymtab_gpl[]; -extern const s32 __start___kcrctab[]; -extern const s32 __start___kcrctab_gpl[]; -#ifndef CONFIG_MODVERSIONS #define symversion (base, idx) NULL#else
@@ -4542,9 +4527,6 @@ static void cfi_cleanup(struct module *mod)#endif } -/* 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) {
Signature · 1 line
2.34.1
PATCH v7 3/13 module: Make internal.h and decompress.c more compliant
In reply to Aaron TomlinThis patch will address the following warning and style violations generated by ./scripts/checkpatch.pl in strict mode:
WARNING: Use #include <linux/module.h> instead of <asm/module.h> #10: FILE: kernel/module/internal.h:10:
+#include <asm/module.h>
CHECK: spaces preferred around that '-' (ctx:VxV) #18: FILE: kernel/module/internal.h:18:
+#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
CHECK: Please use a blank line after function/struct/union/enum declarations #69: FILE: kernel/module/internal.h:69:
+}
+static inline void module_decompress_cleanup(struct load_info *info)
^
CHECK: extern prototypes should be avoided in .h files #84: FILE: kernel/module/internal.h:84:
+extern int mod_verify_sig(const void *mod, struct load_info *info);
WARNING: Missing a blank line after declarations #116: FILE: kernel/module/decompress.c:116:
+ struct page *page = module_get_next_page(info);
+ if (!page) {
WARNING: Missing a blank line after declarations #174: FILE: kernel/module/decompress.c:174:
+ struct page *page = module_get_next_page(info);
+ if (!page) {
CHECK: Please use a blank line after function/struct/union/enum declarations #258: FILE: kernel/module/decompress.c:258:
+}
+static struct kobj_attribute module_compression_attr = __ATTR_RO(compression);
Note: Fortunately, the multiple-include optimisation found in include/linux/module.h will prevent duplication/or inclusion more than once.
--- kernel/module/decompress.c | 3 +++ kernel/module/internal.h | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
kernel/module/decompress.c +3 -0
@@ -113,6 +113,7 @@ static ssize_t module_gzip_decompress(struct load_info *info, do { struct page *page = module_get_next_page(info); + if (!page) { retval = -ENOMEM; goto out_inflate_end;
@@ -171,6 +172,7 @@ static ssize_t module_xz_decompress(struct load_info *info, do { struct page *page = module_get_next_page(info); + if (!page) { retval = -ENOMEM; goto out;
@@ -256,6 +258,7 @@ static ssize_t compression_show(struct kobject *kobj, {return sysfs_emit (buf,"%s\n" ,__stringify (MODULE_COMPRESSION )); } +static struct kobj_attribute module_compression_attr =__ATTR_RO (compression);static int __init module_decompress_sysfs_init (void )
kernel/module/internal.h +4 -2
@@ -6,7 +6,8 @@*/ #include <linux/elf.h> -#include <asm/module.h> +#include <linux/compiler.h> +#include <linux/module.h> #include <linux/mutex.h> #ifndef ARCH_SHF_SMALL
@@ -54,7 +55,7 @@ struct load_info { } index; }; -extern int mod_verify_sig (const void *mod,struct load_info *info); +int mod_verify_sig (const void *mod,struct load_info *info);#ifdef CONFIG_MODULE_DECOMPRESS int module_decompress (struct load_info *info,const void *buf,size_t size);
@@ -65,6 +66,7 @@ static inline int module_decompress(struct load_info *info, {return -EOPNOTSUPP ; } +static inline void module_decompress_cleanup (struct load_info *info) { }
Signature · 1 line
2.34.1
PATCH v7 4/13 module: Move livepatch support to a separate file
In reply to Aaron TomlinNo 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.
--- include/linux/module.h | 9 ++-- kernel/module/Makefile | 1 + kernel/module/internal.h | 22 ++++++++ kernel/module/livepatch.c | 74 +++++++++++++++++++++++++++ kernel/module/main.c | 102 ++++---------------------------------- 5 files changed, 110 insertions(+), 98 deletions(-) create mode 100644 kernel/module/livepatch.c
include/linux/module.h +3 -6
@@ -663,17 +663,14 @@ static inline bool module_requested_async_probing(struct module *module)return module && module->async_probe_requested; } -#ifdef CONFIG_LIVEPATCH static inline bool is_livepatch_module (struct module *mod) { +#ifdef CONFIG_LIVEPATCH return mod->klp; -} -#else /* !CONFIG_LIVEPATCH */ -static inline bool is_livepatch_module (struct module *mod) -{ +#else return false; +#endif } -#endif /* CONFIG_LIVEPATCH */ bool is_module_sig_enforced (void );void set_module_sig_enforced (void );
kernel/module/Makefile +1 -0
@@ -10,3 +10,4 @@ KCOV_INSTRUMENT_module.o := n obj-y += main.o obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o obj-$(CONFIG_MODULE_SIG) += signing.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o
kernel/module/internal.h +22 -0
@@ -57,6 +57,28 @@ struct load_info {int mod_verify_sig (const void *mod,struct load_info *info); +#ifdef CONFIG_LIVEPATCH +int copy_module_elf (struct module *mod,struct load_info *info); +void free_module_elf (struct module *mod); +#else /* !CONFIG_LIVEPATCH */ +static inline int copy_module_elf (struct module *mod,struct load_info *info) +{ +return 0 ; +} + +static inline void free_module_elf (struct module *mod) { } +#endif /* CONFIG_LIVEPATCH */ + +static inline bool set_livepatch_module (struct module *mod) +{ +#ifdef CONFIG_LIVEPATCH + mod->klp = true; +return true; +#else +return false; +#endif +} +#ifdef CONFIG_MODULE_DECOMPRESS int module_decompress (struct load_info *info,const void *buf,size_t size);void module_decompress_cleanup (struct load_info *info);
kernel/module/livepatch.c new file +74 -0
74 lines not on this page · raw message
kernel/module/main.c +10 -92
121 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 5/13 module: Move latched RB-tree support to a separate file
In reply to Aaron TomlinNo 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.
--- kernel/module/Makefile | 3 + kernel/module/internal.h | 33 +++++++++ kernel/module/main.c | 130 ++---------------------------------- kernel/module/tree_lookup.c | 109 ++++++++++++++++++++++++++++++ 4 files changed, 149 insertions(+), 126 deletions(-) create mode 100644 kernel/module/tree_lookup.c
kernel/module/Makefile +3 -0
@@ -11,3 +11,6 @@ obj-y += main.o obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o obj-$(CONFIG_MODULE_SIG) += signing.o obj-$(CONFIG_LIVEPATCH) += livepatch.o +ifdef CONFIG_MODULES +obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o +endif
kernel/module/internal.h +33 -0
@@ -9,6 +9,7 @@#include <linux/compiler.h> #include <linux/module.h> #include <linux/mutex.h> +#include <linux/rculist.h> #ifndef ARCH_SHF_SMALL #define ARCH_SHF_SMALL 0
@@ -93,3 +94,35 @@ static inline void module_decompress_cleanup(struct load_info *info) { }#endif + +#ifdef CONFIG_MODULES_TREE_LOOKUP +struct mod_tree_root { +struct latch_tree_root root; +unsigned long addr_min; +unsigned long addr_max; +}; + +extern struct mod_tree_root mod_tree; + +void mod_tree_insert (struct module *mod); +void mod_tree_remove_init (struct module *mod); +void mod_tree_remove (struct module *mod); +struct module *mod_find (unsigned long addr); +#else /* !CONFIG_MODULES_TREE_LOOKUP */ + +static inline void mod_tree_insert (struct module *mod) { } +static inline void mod_tree_remove_init (struct module *mod) { } +static inline void mod_tree_remove (struct module *mod) { } +static inline struct module *mod_find (unsigned long addr) +{ +struct module *mod; + +list_for_each_entry_rcu (mod, &modules, list, +lockdep_is_held (&module_mutex)) { +if (within_module (addr, mod)) +return mod; + } + +return NULL ; +} +#endif /* CONFIG_MODULES_TREE_LOOKUP */
kernel/module/main.c +4 -126
142 lines not on this page · raw message
kernel/module/tree_lookup.c new file +109 -0
109 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v7 05/13] module: Move latched RB-tree support to a separate file
Le 22/02/2022 à 14:09, Aaron Tomlin a écrit :
Quoted 20 lines
No functional change.
This patch migrates module latched RB-tree support (e.g. see
__module_address()) from core module code intokernel/module/tree_lookup.c.Signed-off-by Aaron Tomlin <[email protected]>--- kernel/module/Makefile | 3 + kernel/module/internal.h | 33 +++++++++ kernel/module/main.c | 130 ++---------------------------------- kernel/module/tree_lookup.c | 109 ++++++++++++++++++++++++++++++ 4 files changed, 149 insertions(+), 126 deletions(-)create mode 100644
kernel/module/tree_lookup.ckernel/module/Makefile +0
-0
kernel/module/Makefile obj-y += main.o · line 14
Quoted 4 lines
kernel/module/Makefile +1
-0@@ -11,3 +11,6 @@ obj-y += main.o obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o obj-$(CONFIG_MODULE_SIG) += signing.o obj-$(CONFIG_LIVEPATCH) += livepatch.o +ifdef CONFIG_MODULES
This ifdef is not needed anymore.
kernel/module/Makefile obj-y += main.o · line 16
Quoted 2 lines
kernel/module/Makefile +2
-0+obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o +endif
Christophe
Aaron Tomlin
reviewerRe: [PATCH v7 05/13] module: Move latched RB-tree support to a separate file
Quoted 28 lines · Christophe Leroy
Le 22/02/2022 à 14:09, Aaron Tomlin a écrit :
Quoted 20 lines
No functional change.
This patch migrates module latched RB-tree support (e.g. see
__module_address()) from core module code intokernel/module/tree_lookup.c.Signed-off-by Aaron Tomlin <[email protected]>--- kernel/module/Makefile | 3 + kernel/module/internal.h | 33 +++++++++ kernel/module/main.c | 130 ++---------------------------------- kernel/module/tree_lookup.c | 109 ++++++++++++++++++++++++++++++ 4 files changed, 149 insertions(+), 126 deletions(-)create mode 100644
kernel/module/tree_lookup.ckernel/module/Makefile +0
-0kernel/module/Makefile obj-y += main.o · line 14
Quoted 4 lines
kernel/module/Makefile +1
-0@@ -11,3 +11,6 @@ obj-y += main.o obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o obj-$(CONFIG_MODULE_SIG) += signing.o obj-$(CONFIG_LIVEPATCH) += livepatch.o +ifdef CONFIG_MODULESThis ifdef is not needed anymore.
Quoted 2 lines
kernel/module/Makefile obj-y += main.o · line 16
Quoted 2 lines
kernel/module/Makefile +2
-0+obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o +endif
Oops! Apologies this was an oversight.
Signature · 1 line
Aaron Tomlin
PATCH v7 6/13 module: Move strict rwx support to a separate file
In reply to Aaron TomlinNo 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 intokernel/module/strict_rwx.c.
--- kernel/module/Makefile | 1 + kernel/module/internal.h | 32 ++++++++++++ kernel/module/main.c | 99 +------------------------------------- kernel/module/strict_rwx.c | 85 ++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 97 deletions(-) create mode 100644 kernel/module/strict_rwx.c
kernel/module/Makefile +1 -0
@@ -13,4 +13,5 @@ obj-$(CONFIG_MODULE_SIG) += signing.o obj-$(CONFIG_LIVEPATCH) += livepatch.o ifdef CONFIG_MODULES obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o +obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o endif
kernel/module/internal.h +32 -0
@@ -20,6 +20,17 @@/* Maximum number of characters written by module_flags() */ #define MODULE_FLAGS_BUF_SIZE (TAINT_FLAGS_COUNT + 4) +/* +* 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=y +*/ +#ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX +# define debug_align (X ) PAGE_ALIGN(X) +#else +# define debug_align (X ) (X) +#endif +extern struct mutex module_mutex;extern struct list_head modules;
@@ -126,3 +137,24 @@ static inline struct module *mod_find(unsigned long addr)return NULL ; }#endif /* CONFIG_MODULES_TREE_LOOKUP */ + +#ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX +void frob_text (const struct module_layout *layout,int (*set_memory)(unsigned long start, +int num_pages)); +#endif /* CONFIG_ARCH_HAS_STRICT_MODULE_RWX */ + +#ifdef CONFIG_STRICT_MODULE_RWX +void module_enable_ro (const struct module *mod,bool after_init); +void module_enable_nx (const struct module *mod); +int module_enforce_rwx_sections (Elf_Ehdr *hdr,Elf_Shdr *sechdrs, +char *secstrings,struct module *mod); + +#else /* !CONFIG_STRICT_MODULE_RWX */ +static inline void module_enable_nx (const struct module *mod) { } +static inline void module_enable_ro (const struct module *mod,bool after_init) {} +static inline int module_enforce_rwx_sections (Elf_Ehdr *hdr,Elf_Shdr *sechdrs, +char *secstrings,struct module *mod) +{ +return 0 ; +} +#endif /* CONFIG_STRICT_MODULE_RWX */
kernel/module/main.c +2 -97
117 lines not on this page · raw message
kernel/module/strict_rwx.c new file +85 -0
85 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 7/13 module: Move extra signature support out of core code
In reply to Aaron TomlinNo functional change.
This patch migrates additional module signature check code from core module code into kernel/module/signing.c.
--- kernel/module/internal.h | 9 +++++ kernel/module/main.c | 87 ---------------------------------------- kernel/module/signing.c | 77 +++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 87 deletions(-)
kernel/module/internal.h +9 -0
@@ -158,3 +158,12 @@ static inline int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, return 0; }#endif /* CONFIG_STRICT_MODULE_RWX */ + +#ifdef CONFIG_MODULE_SIG +int module_sig_check (struct load_info *info,int flags); +#else /* !CONFIG_MODULE_SIG */ +static inline int module_sig_check (struct load_info *info,int flags) +{ +return 0 ; +} +#endif /* !CONFIG_MODULE_SIG */
kernel/module/main.c +0 -87
105 lines not on this page · raw message
kernel/module/signing.c +77 -0
89 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 8/13 module: Move kmemleak support to a separate file
In reply to Aaron TomlinNo functional change.
This patch migrates kmemleak code out of core module code into kernel/module/debug_kmemleak.c
--- kernel/module/Makefile | 1 + kernel/module/debug_kmemleak.c | 30 ++++++++++++++++++++++++++++++ kernel/module/internal.h | 7 +++++++ kernel/module/main.c | 27 --------------------------- 4 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 kernel/module/debug_kmemleak.c
kernel/module/Makefile +1 -0
@@ -14,4 +14,5 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o ifdef CONFIG_MODULES obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o +obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o endif
kernel/module/debug_kmemleak.c new file +30 -0
@@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Module kmemleak support +* +* Copyright (C) 2009 Catalin Marinas +*/ + +#include <linux/module.h> +#include <linux/kmemleak.h> +#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 =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 ); + } +}
kernel/module/internal.h +7 -0
@@ -167,3 +167,10 @@ static inline int module_sig_check(struct load_info *info, int flags) return 0; }#endif /* !CONFIG_MODULE_SIG */ + +#ifdef CONFIG_DEBUG_KMEMLEAK +void kmemleak_load_module (const struct module *mod,const struct load_info *info); +#else /* !CONFIG_DEBUG_KMEMLEAK */ +static inline void kmemleak_load_module (const struct module *mod, +const struct load_info *info) { } +#endif /* CONFIG_DEBUG_KMEMLEAK */
kernel/module/main.c +0 -27
@@ -2519,33 +2519,6 @@ bool __weak module_exit_section(const char *name)return strstarts (name,".exit" ); } -#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 =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 )
Signature · 1 line
2.34.1
PATCH v7 9/13 module: Move kallsyms support into a separate file
In reply to Aaron TomlinNo functional change.
This patch migrates kallsyms code out of core module code kernel/module/kallsyms.c
--- kernel/module/Makefile | 1 + kernel/module/internal.h | 29 +++ kernel/module/kallsyms.c | 506 +++++++++++++++++++++++++++++++++++++ kernel/module/main.c | 531 +-------------------------------------- 4 files changed, 542 insertions(+), 525 deletions(-) create mode 100644 kernel/module/kallsyms.c
kernel/module/Makefile +1 -0
@@ -15,4 +15,5 @@ ifdef CONFIG_MODULES obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o +obj-$(CONFIG_KALLSYMS) += kallsyms.o endif
kernel/module/internal.h +29 -0
@@ -68,6 +68,19 @@ struct load_info { };int mod_verify_sig (const void *mod,struct load_info *info); +struct module *find_module_all (const char *name,size_t len,bool even_unformed); +int cmp_name (const void *name,const void *sym); +long module_get_offset (struct module *mod,unsigned int *size,Elf_Shdr *sechdr, +unsigned int section); + +static inline unsigned long kernel_symbol_value (const struct kernel_symbol *sym) +{ +#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS +return (unsigned long )offset_to_ptr (&sym->value_offset); +#else +return sym->value; +#endif +}#ifdef CONFIG_LIVEPATCH int copy_module_elf (struct module *mod,struct load_info *info);
@@ -174,3 +187,19 @@ void kmemleak_load_module(const struct module *mod, const struct load_info *infostatic inline void kmemleak_load_module (const struct module *mod,const struct load_info *info) { }#endif /* CONFIG_DEBUG_KMEMLEAK */ + +#ifdef CONFIG_KALLSYMS +void init_build_id (struct module *mod,const struct load_info *info); +void layout_symtab (struct module *mod,struct load_info *info); +void add_kallsyms (struct module *mod,const struct load_info *info); +unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name); + +static inline bool sect_empty (const Elf_Shdr *sect) +{ +return !(sect->sh_flags &SHF_ALLOC ) || sect->sh_size ==0 ; +} +#else /* !CONFIG_KALLSYMS */ +static inline void init_build_id (struct module *mod,const struct load_info *info) { } +static inline void layout_symtab (struct module *mod,struct load_info *info) { } +static inline void add_kallsyms (struct module *mod,const struct load_info *info) { } +#endif /* CONFIG_KALLSYMS */
kernel/module/kallsyms.c new file +506 -0
506 lines not on this page · raw message
kernel/module/main.c +6 -525
585 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 10/13 module: Move procfs support into a separate file
In reply to Aaron TomlinNo 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.
--- 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
kernel/module/Makefile +1 -0
@@ -16,4 +16,5 @@ obj-$(CONFIG_MODULES_TREE_LOOKUP) += tree_lookup.o obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o obj-$(CONFIG_KALLSYMS) += kallsyms.o +obj-$(CONFIG_PROC_FS) += procfs.o endif
kernel/module/internal.h +1 -0
@@ -72,6 +72,7 @@ struct module *find_module_all(const char *name, size_t len, bool even_unformed)int cmp_name (const void *name,const void *sym);long module_get_offset (struct module *mod,unsigned int *size,Elf_Shdr *sechdr,unsigned int section); +char *module_flags (struct module *mod,char *buf);static inline unsigned long kernel_symbol_value (const struct kernel_symbol *sym) {
kernel/module/main.c +1 -130
161 lines not on this page · raw message
kernel/module/procfs.c new file +142 -0
142 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 11/13 module: Move sysfs support into a separate file
In reply to Aaron TomlinNo 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.
--- kernel/module/Makefile | 1 + kernel/module/internal.h | 21 ++ kernel/module/main.c | 469 +-------------------------------------- kernel/module/sysfs.c | 436 ++++++++++++++++++++++++++++++++++++ 4 files changed, 461 insertions(+), 466 deletions(-) create mode 100644 kernel/module/sysfs.c
kernel/module/Makefile +1 -0
@@ -17,4 +17,5 @@ obj-$(CONFIG_STRICT_MODULE_RWX) += strict_rwx.o obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_PROC_FS) += procfs.o +obj-$(CONFIG_SYSFS) += sysfs.o endif
kernel/module/internal.h +21 -0
@@ -34,6 +34,9 @@extern struct mutex module_mutex;extern struct list_head modules; +extern struct module_attribute *modinfo_attrs[]; +extern size_t modinfo_attrs_count; +/* Provided by the linker */ extern const struct kernel_symbol __start___ksymtab[];extern const struct kernel_symbol __stop___ksymtab[];
@@ -204,3 +207,21 @@ static inline void init_build_id(struct module *mod, const struct load_info *infstatic inline void layout_symtab (struct module *mod,struct load_info *info) { }static inline void add_kallsyms (struct module *mod,const struct load_info *info) { }#endif /* CONFIG_KALLSYMS */ + +#ifdef CONFIG_SYSFS +int mod_sysfs_setup (struct module *mod,const struct load_info *info, +struct kernel_param *kparam,unsigned int num_params); +void mod_sysfs_teardown (struct module *mod); +void init_param_lock (struct module *mod); +#else /* !CONFIG_SYSFS */ +static inline int mod_sysfs_setup (struct module *mod, +const struct load_info *info, +struct kernel_param *kparam, +unsigned int num_params) +{ +return 0 ; +} + +static inline void mod_sysfs_teardown (struct module *mod) { } +static inline void init_param_lock (struct module *mod) { } +#endif /* CONFIG_SYSFS */
kernel/module/main.c +3 -466
494 lines not on this page · raw message
kernel/module/sysfs.c new file +436 -0
436 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 12/13 module: Move kdb_modules list out of core code
In reply to Aaron TomlinNo functional change.
This patch migrates kdb_modules list to core kdb code since the list of added/or loaded modules is no longer private.
--- kernel/debug/kdb/kdb_main.c | 5 +++++ kernel/debug/kdb/kdb_private.h | 4 ---- kernel/module/main.c | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-)
kernel/debug/kdb/kdb_main.c +5 -0
@@ -59,6 +59,11 @@ EXPORT_SYMBOL(kdb_grepping_flag);int kdb_grep_leading;int kdb_grep_trailing; +#ifdef CONFIG_MODULES +extern struct list_head modules; +static struct list_head *kdb_modules = &modules;/* kdb needs the list of modules */ +#endif /* CONFIG_MODULES */ +/* * Kernel debugger state flags */
kernel/debug/kdb/kdb_private.h +0 -4
@@ -226,10 +226,6 @@ extern void kdb_kbd_cleanup_state(void);#define kdb_kbd_cleanup_state ()#endif /* ! CONFIG_KDB_KEYBOARD */ -#ifdef CONFIG_MODULES -extern struct list_head *kdb_modules; -#endif /* CONFIG_MODULES */ -extern char kdb_prompt_str[];#define KDB_WORD_SIZE ((int)sizeof(unsigned long))
kernel/module/main.c +0 -4
@@ -108,10 +108,6 @@ static void mod_update_bounds(struct module *mod)__mod_update_bounds (mod->init_layout.base, mod->init_layout.size); } -#ifdef CONFIG_KGDB_KDB -struct list_head *kdb_modules = &modules;/* kdb needs the list of modules */ -#endif /* CONFIG_KGDB_KDB */ -static void module_assert_mutex_or_preempt (void ) {#ifdef CONFIG_LOCKDEP
Signature · 1 line
2.34.1
PATCH v7 13/13 module: Move version support into a separate file
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.
--- kernel/module/Makefile | 1 + kernel/module/internal.h | 48 ++++++++++++ kernel/module/main.c | 156 ++------------------------------------- kernel/module/version.c | 109 +++++++++++++++++++++++++++ 4 files changed, 166 insertions(+), 148 deletions(-) create mode 100644 kernel/module/version.c
kernel/module/Makefile +1 -0
@@ -18,4 +18,5 @@ obj-$(CONFIG_DEBUG_KMEMLEAK) += debug_kmemleak.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_PROC_FS) += procfs.o obj-$(CONFIG_SYSFS) += sysfs.o +obj-$(CONFIG_MODVERSIONS) += version.o endif
kernel/module/internal.h +48 -0
58 lines not on this page · raw message
kernel/module/main.c +8 -148
189 lines not on this page · raw message
kernel/module/version.c new file +109 -0
109 lines not on this page · raw message
Signature · 1 line
2.34.1