Commit b82bab4b authored by Jason Baron's avatar Jason Baron Committed by Linus Torvalds

dynamic debug: move ddebug_remove_module() down into free_module()

The command

	echo "file ec.c +p" >/sys/kernel/debug/dynamic_debug/control

causes an oops.

Move the call to ddebug_remove_module() down into free_module().  In this
way it should be called from all error paths.  Currently, we are missing
the remove if the module init routine fails.
Signed-off-by: default avatarJason Baron <>
Reported-by: default avatarThomas Renninger <>
Tested-by: default avatarThomas Renninger <>
Cc: <>		[2.6.32+]
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent d15aa2cc
......@@ -787,7 +787,6 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
/* Store the name of the last unloaded module for diagnostic purposes */
strlcpy(last_unloaded_module, mod->name, sizeof(last_unloaded_module));
return 0;
......@@ -1550,6 +1549,9 @@ static void free_module(struct module *mod)
/* Remove dynamic debug info */
/* Arch-specific cleanup. */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment