mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] module: fix ddebug_remove_module()
@ 2017-07-07  3:15 Zhou Chengming
  2017-07-11 14:32 ` Jessica Yu
  0 siblings, 1 reply; 2+ messages in thread
From: Zhou Chengming @ 2017-07-07  3:15 UTC (permalink / raw)
  To: jeyu, rusty, jpoimboe; +Cc: linux-kernel, huawei.libin, zhouchengming1

ddebug_remove_module() use mod->name to find the ddebug_table of the
module and remove it. But dynamic_debug_setup() use the first
_ddebug->modname to create ddebug_table for the module. It's ok when
the _ddebug->modname is the same with the mod->name.

But livepatch module is special, it may contain _ddebugs of other
modules, the modname of which is different from the name of livepatch
module. So ddebug_remove_module() can't use mod->name to find the
right ddebug_table and remove it. It can cause kernel crash when we cat
the file <debugfs>/dynamic_debug/control.

Signed-off-by: Zhou Chengming <zhouchengming1@huawei.com>
---
 kernel/module.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel/module.c b/kernel/module.c
index 4a3665f..dac9805 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2703,21 +2703,21 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
 }
 #endif /* CONFIG_KALLSYMS */
 
-static void dynamic_debug_setup(struct _ddebug *debug, unsigned int num)
+static void dynamic_debug_setup(struct module *mod, struct _ddebug *debug, unsigned int num)
 {
 	if (!debug)
 		return;
 #ifdef CONFIG_DYNAMIC_DEBUG
-	if (ddebug_add_module(debug, num, debug->modname))
+	if (ddebug_add_module(debug, num, mod->name))
 		pr_err("dynamic debug error adding module: %s\n",
 			debug->modname);
 #endif
 }
 
-static void dynamic_debug_remove(struct _ddebug *debug)
+static void dynamic_debug_remove(struct module *mod, struct _ddebug *debug)
 {
 	if (debug)
-		ddebug_remove_module(debug->modname);
+		ddebug_remove_module(mod->name);
 }
 
 void * __weak module_alloc(unsigned long size)
@@ -3697,7 +3697,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
 		goto free_arch_cleanup;
 	}
 
-	dynamic_debug_setup(info->debug, info->num_debug);
+	dynamic_debug_setup(mod, info->debug, info->num_debug);
 
 	/* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
 	ftrace_module_init(mod);
@@ -3761,7 +3761,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
 	module_disable_nx(mod);
 
  ddebug_cleanup:
-	dynamic_debug_remove(info->debug);
+	dynamic_debug_remove(mod, info->debug);
 	synchronize_sched();
 	kfree(mod->args);
  free_arch_cleanup:
-- 
1.8.3.1

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: module: fix ddebug_remove_module()
  2017-07-07  3:15 [PATCH] module: fix ddebug_remove_module() Zhou Chengming
@ 2017-07-11 14:32 ` Jessica Yu
  0 siblings, 0 replies; 2+ messages in thread
From: Jessica Yu @ 2017-07-11 14:32 UTC (permalink / raw)
  To: Zhou Chengming; +Cc: rusty, jpoimboe, linux-kernel, huawei.libin

+++ Zhou Chengming [07/07/17 11:15 +0800]:
>ddebug_remove_module() use mod->name to find the ddebug_table of the
>module and remove it. But dynamic_debug_setup() use the first
>_ddebug->modname to create ddebug_table for the module. It's ok when
>the _ddebug->modname is the same with the mod->name.
>
>But livepatch module is special, it may contain _ddebugs of other
>modules, the modname of which is different from the name of livepatch
>module. So ddebug_remove_module() can't use mod->name to find the

s/mod->name/_ddebug->modname/ :) I'll fix the typo in the changelog.

>right ddebug_table and remove it. It can cause kernel crash when we cat
>the file <debugfs>/dynamic_debug/control.
>
>Signed-off-by: Zhou Chengming <zhouchengming1@huawei.com>

Makes sense, I have this queued up to be applied to modules-next.

By the way, although I can see how livepatch modules can end up
including a hodgepodge of _ddebug entries from different modules,
wouldn't the correct thing to do be to have the modname of the
livepatch module instead of the modules they originally came from? I
think when the pr_debug's are enabled it'll print the name of the
original module instead of the livepatch module.

Jessica

> kernel/module.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/kernel/module.c b/kernel/module.c
>index 4a3665f..dac9805 100644
>--- a/kernel/module.c
>+++ b/kernel/module.c
>@@ -2703,21 +2703,21 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
> }
> #endif /* CONFIG_KALLSYMS */
>
>-static void dynamic_debug_setup(struct _ddebug *debug, unsigned int num)
>+static void dynamic_debug_setup(struct module *mod, struct _ddebug *debug, unsigned int num)
> {
> 	if (!debug)
> 		return;
> #ifdef CONFIG_DYNAMIC_DEBUG
>-	if (ddebug_add_module(debug, num, debug->modname))
>+	if (ddebug_add_module(debug, num, mod->name))
> 		pr_err("dynamic debug error adding module: %s\n",
> 			debug->modname);
> #endif
> }
>
>-static void dynamic_debug_remove(struct _ddebug *debug)
>+static void dynamic_debug_remove(struct module *mod, struct _ddebug *debug)
> {
> 	if (debug)
>-		ddebug_remove_module(debug->modname);
>+		ddebug_remove_module(mod->name);
> }
>
> void * __weak module_alloc(unsigned long size)
>@@ -3697,7 +3697,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
> 		goto free_arch_cleanup;
> 	}
>
>-	dynamic_debug_setup(info->debug, info->num_debug);
>+	dynamic_debug_setup(mod, info->debug, info->num_debug);
>
> 	/* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
> 	ftrace_module_init(mod);
>@@ -3761,7 +3761,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
> 	module_disable_nx(mod);
>
>  ddebug_cleanup:
>-	dynamic_debug_remove(info->debug);
>+	dynamic_debug_remove(mod, info->debug);
> 	synchronize_sched();
> 	kfree(mod->args);
>  free_arch_cleanup:
>-- 
>1.8.3.1
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-07-11 14:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-07  3:15 [PATCH] module: fix ddebug_remove_module() Zhou Chengming
2017-07-11 14:32 ` Jessica Yu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®