Commit c593091c authored Jan 19, 2017 by Juerg Haefliger Committed by Greg Kroah-Hartman Oct 08, 2017

lkdtm: Fix Oops when unloading the module




[ Upstream commit 9ba60573638e2006170ebcc5489fb1e068afbc8f ]

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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6329973b

drivers/misc/lkdtm_core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -533,7 +533,9 @@ static void __exit lkdtm_module_exit(void)
		/* Handle test-specific clean-up. */
		lkdtm_usercopy_exit();

		if (lkdtm_jprobe != NULL)
		unregister_jprobe(lkdtm_jprobe);

		pr_info("Crash point unregistered\n");
		}