Browse Source

lkdtm: Fix Oops when unloading the module

No jprobe is registered when the module is loaded without specifying a
crashpoint that uses a jprobe. At the moment, we unconditionally try to
unregister the jprobe on module unload which results in an Oops. Add a
check to fix this.

Signed-off-by: Juerg Haefliger <juerg.haefliger@hpe.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Juerg Haefliger 8 years ago
parent
commit
9ba6057363
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/misc/lkdtm_core.c

+ 3 - 1
drivers/misc/lkdtm_core.c

@@ -535,7 +535,9 @@ static void __exit lkdtm_module_exit(void)
 	/* Handle test-specific clean-up. */
 	/* Handle test-specific clean-up. */
 	lkdtm_usercopy_exit();
 	lkdtm_usercopy_exit();
 
 
-	unregister_jprobe(lkdtm_jprobe);
+	if (lkdtm_jprobe != NULL)
+		unregister_jprobe(lkdtm_jprobe);
+
 	pr_info("Crash point unregistered\n");
 	pr_info("Crash point unregistered\n");
 }
 }