lkml.org 
[lkml]   [2011]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
On Tue, Oct 25, 2011 at 10:04:55PM +0200, Greg Kroah-Hartman wrote:
> On Tue, Oct 25, 2011 at 12:51:42PM -0400, Nick Bowler wrote:
> > On 2011-10-25 18:05 +0200, Ben Hutchings wrote:
> > > On Tue, 2011-10-25 at 11:38 -0400, Nick Bowler wrote:
> > > > This patch prevents the use of lockdep for debugging out of tree
> > > > modules, which is rather mean.
> > >
> > > It was already disabled for staging modules, which seems equally
> > > unhelpful.
> >
> > This is not the case: lockdep works fine with staging modules.
>
> Yes, that was fixed a few kernel versions ago.
>
> Now you might want to update that fix for the TAINT_OOT_MODULE flag as
> well, if you feel it is needed.

I'm assuming you mean this patch ?

commit 7816c45bf13255157c00fb8aca86cb64d825e878
Author: Roland Vossen <rvossen@broadcom.com>
Date: Thu Apr 7 11:20:58 2011 +0200

modules: Enabled dynamic debugging for staging modules

Driver modules from the staging directory are marked 'tainted'
by module.c. Subsequently, tainted modules are denied dynamic
debugging. This is unwanted behavior, since staging modules should
be able to use the dynamic debugging mechanism.

Please merge this also into the staging-linus branch.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/kernel/module.c b/kernel/module.c
index d5938a5..4d5c16a 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2790,7 +2790,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)
+ if (!mod->taints || mod->taints == (1U<<TAINT_CRAP))
dynamic_debug_setup(info.debug, info.num_debug);

/* Find duplicate symbols */
@@ -2827,7 +2827,7 @@ static struct module *load_module(void __user *umod,
module_bug_cleanup(mod);

ddebug:
- if (!mod->taints)
+ if (!mod->taints || mod->taints == (1U<<TAINT_CRAP))
dynamic_debug_remove(info.debug);
unlock:
mutex_unlock(&module_mutex);


If we want to support out of tree modules with this, should we just nuke the
whole check, or do we still want to prevent certain types of tainted kernels
from using this stuff ?

(sidenote: it's not immediately obvious to me that this is the right patch,
as dynamic debug & lockdep are separate things, though this was the only
thing in kernel/module.c's history this year that sounds similar)

Dave



\
 
 \ /
  Last update: 2011-10-25 22:21    [W:0.167 / U:0.312 seconds]
©2003-2014 Jasper Spaans. Advertise on this site