Re: [PATCH] lkdtm: Fix Oops when unloading the module

[Kees Cook]

On Thu, Jan 19, 2017 at 2:40 AM, Juerg Haefliger
<juerg.haefliger@xxxxxxx> wrote:
> 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@xxxxxxx>

Ah-ha, nice catch, thanks!

Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>

Greg, can you please add this to your tree when you get a chance?

-Kees

> ---
>  drivers/misc/lkdtm_core.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/misc/lkdtm_core.c b/drivers/misc/lkdtm_core.c
> index 7eeb71a75549..4d44084071d8 100644
> --- a/drivers/misc/lkdtm_core.c
> +++ b/drivers/misc/lkdtm_core.c
> @@ -535,7 +535,9 @@ static void __exit lkdtm_module_exit(void)
>         /* Handle test-specific clean-up. */
>         lkdtm_usercopy_exit();
>
> -       unregister_jprobe(lkdtm_jprobe);
> +       if (lkdtm_jprobe != NULL)
> +               unregister_jprobe(lkdtm_jprobe);
> +
>         pr_info("Crash point unregistered\n");
>  }
>
> --
> 2.11.0
>



-- 
Kees Cook
Nexus Security