Re: [PATCH 2/2] module: Re-enable dynamic debugging for GPL-compatible OOT modules

[Rusty Russell <rusty@rustcorp.com.au>]

On Fri, 28 Oct 2011 04:38:14 +0100, Ben Hutchings <ben@decadent.org.uk> wrote:
> Dynamic debugging was enabled for GPL-compatible out-of-tree modules
> until my addition of TAINT_OOT_MODULE.  It should continue to be
> enabled now.

Please just remove the test entirely.

AFAICT there's nothing unique to dynamic debug which means it should
avoid taint.  If it oopses, we'll learn all about tainting in the oops
message.

> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
>  kernel/module.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/module.c b/kernel/module.c
> index dab585e..448fd77 100644
> --- a/kernel/module.c
> +++ b/kernel/module.c
> @@ -2881,7 +2881,7 @@ static struct module *load_module(void __user *umod,
>  	}
>  
>  	/* This has to be done once we're sure module name is unique. */
> -	if (!mod->taints || mod->taints == (1U<<TAINT_CRAP))
> +	if (!(mod->taints & ~(1U << TAINT_CRAP | 1U << TAINT_OOT_MODULE)))
>  		dynamic_debug_setup(info.debug, info.num_debug);
>  
>  	/* Find duplicate symbols */
> @@ -2918,7 +2918,7 @@ static struct module *load_module(void __user *umod,
>  	module_bug_cleanup(mod);
>  
>   ddebug:
> -	if (!mod->taints || mod->taints == (1U<<TAINT_CRAP))
> +	if (!(mod->taints & ~(1U << TAINT_CRAP | 1U << TAINT_OOT_MODULE)))
>  		dynamic_debug_remove(info.debug);
>   unlock:
>  	mutex_unlock(&module_mutex);
> -- 
> 1.7.7
> 
>