ftrace: remove old pointers to mcount

When a mcount pointer is recorded into a table, it is used to add or
remove calls to mcount (replacing them with nops). If the code is removed
via removing a module, the pointers still exist.  At modifying the code
a check is always made to make sure the code being replaced is the code
expected. In-other-words, the code being replaced is compared to what
it is expected to be before being replaced.

There is a very small chance that the code being replaced just happens
to look like code that calls mcount (very small since the call to mcount
is relative). To remove this chance, this patch adds ftrace_release to
allow module unloading to remove the pointers to mcount within the module.

Another change for init calls is made to not trace calls marked with
__init. The tracing can not be started until after init is done anyway.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 8 insertions, 4 deletions

diff --git a/kernel/module.c b/kernel/module.c
index d753fd9d83ec..7576c2d9462f 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1431,6 +1431,9 @@ static void free_module(struct module *mod)
         /* Module unload stuff */
         module_unload_free(mod);
 
+        /* release any pointers to mcount in this module */
+        ftrace_release(mod->module_core, mod->core_size);
+
         /* This may be NULL, but that's OK */
         module_free(mod, mod->module_init);
         kfree(mod->args);
@@ -1839,6 +1842,7 @@ static noinline struct module *load_module(void __user *umod,
         struct module *mod;
         long err = 0;
         void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */
+        void *mseg;
         struct exception_table_entry *extable;
         mm_segment_t old_fs;
 
@@ -2190,10 +2194,9 @@ static noinline struct module *load_module(void __user *umod,
 #endif
         }
 
-        if (mcountindex) {
-                void *mseg = (void *)sechdrs[mcountindex].sh_addr;
-                ftrace_init_module(mseg, mseg + sechdrs[mcountindex].sh_size);
-        }
+        /* sechdrs[0].sh_size is always zero */
+        mseg = (void *)sechdrs[mcountindex].sh_addr;
+        ftrace_init_module(mseg, mseg + sechdrs[mcountindex].sh_size);
 
         err = module_finalize(hdr, sechdrs, mod);
         if (err < 0)
@@ -2264,6 +2267,7 @@ static noinline struct module *load_module(void __user *umod,
  cleanup:
         kobject_del(&mod->mkobj.kobj);
         kobject_put(&mod->mkobj.kobj);
+        ftrace_release(mod->module_core, mod->core_size);
  free_unload:
         module_unload_free(mod);
         module_free(mod, mod->module_init);