Linux 6.10-rc3

[linux-2.6-block.git] / kernel / module / main.c

diff --git a/kernel/module/main.c b/kernel/module/main.c
index 91e185607d4b01627f2c986fe9aeb9a88039b5a2..d18a94b973e1027a7ab4459dfee8050e5be6e524 100644 (file)
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -56,6 +56,7 @@
 #include <linux/dynamic_debug.h>
 #include <linux/audit.h>
 #include <linux/cfi.h>
+#include <linux/codetag.h>
 #include <linux/debugfs.h>
 #include <linux/execmem.h>
 #include <uapi/linux/module.h>
@@ -1224,14 +1225,18 @@ static int module_memory_alloc(struct module *mod, enum mod_mem_type type)
        return 0;
 }
 
-static void module_memory_free(struct module *mod, enum mod_mem_type type)
+static void module_memory_free(struct module *mod, enum mod_mem_type type,
+                              bool unload_codetags)
 {
        void *ptr = mod->mem[type].base;
 
+       if (!unload_codetags && mod_mem_type_is_core_data(type))
+               return;
+
        execmem_free(ptr);
 }
 
-static void free_mod_mem(struct module *mod)
+static void free_mod_mem(struct module *mod, bool unload_codetags)
 {
        for_each_mod_mem_type(type) {
                struct module_memory *mod_mem = &mod->mem[type];
@@ -1242,19 +1247,26 @@ static void free_mod_mem(struct module *mod)
                /* Free lock-classes; relies on the preceding sync_rcu(). */
                lockdep_free_key_range(mod_mem->base, mod_mem->size);
                if (mod_mem->size)
-                       module_memory_free(mod, type);
+                       module_memory_free(mod, type, unload_codetags);
        }
 
        /* MOD_DATA hosts mod, so free it at last */
        lockdep_free_key_range(mod->mem[MOD_DATA].base, mod->mem[MOD_DATA].size);
-       module_memory_free(mod, MOD_DATA);
+       module_memory_free(mod, MOD_DATA, unload_codetags);
 }
 
 /* Free a module, remove from lists, etc. */
 static void free_module(struct module *mod)
 {
+       bool unload_codetags;
+
        trace_module_free(mod);
 
+       unload_codetags = codetag_unload_module(mod);
+       if (!unload_codetags)
+               pr_warn("%s: memory allocation(s) from the module still alive, cannot unload cleanly\n",
+                       mod->name);
+
        mod_sysfs_teardown(mod);
 
        /*
@@ -1296,7 +1308,7 @@ static void free_module(struct module *mod)
        kfree(mod->args);
        percpu_modfree(mod);
 
-       free_mod_mem(mod);
+       free_mod_mem(mod, unload_codetags);
 }
 
 void *__symbol_get(const char *symbol)
@@ -2287,7 +2299,7 @@ static int move_module(struct module *mod, struct load_info *info)
        return 0;
 out_enomem:
        for (t--; t >= 0; t--)
-               module_memory_free(mod, t);
+               module_memory_free(mod, t, true);
        return ret;
 }
 
@@ -2417,7 +2429,7 @@ static void module_deallocate(struct module *mod, struct load_info *info)
        percpu_modfree(mod);
        module_arch_freeing_init(mod);
 
-       free_mod_mem(mod);
+       free_mod_mem(mod, true);
 }
 
 int __weak module_finalize(const Elf_Ehdr *hdr,
@@ -2986,6 +2998,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
        /* Get rid of temporary copy. */
        free_copy(info, flags);
 
+       codetag_load_module(mod);
+
        /* Done! */
        trace_module_load(mod);