Commit c10076c4 authored Jan 13, 2012 by Steven Rostedt Committed by Steven Rostedt Jan 16, 2012

tracepoints/module: Fix disabling tracepoints with taint CRAP or OOT



Tracepoints are disabled for tainted modules, which is usually because the
module is either proprietary or was forced, and we don't want either of them
using kernel tracepoints.

But, a module can also be tainted by being in the staging directory or
compiled out of tree. Either is fine for use with tracepoints, no need
to punish them.  I found this out when I noticed that my sample trace event
module, when done out of tree, stopped working.

Cc: stable@vger.kernel.org # 3.2
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Dave Jones <davej@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent 2e885057

kernel/tracepoint.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -634,10 +634,11 @@ static int tracepoint_module_coming(struct module *mod)
		int ret = 0;

		/*
		* We skip modules that tain the kernel, especially those with different
		* module header (for forced load), to make sure we don't cause a crash.
		* We skip modules that taint the kernel, especially those with different
		* module headers (for forced load), to make sure we don't cause a crash.
		* Staging and out-of-tree GPL modules are fine.
		*/
		if (mod->taints)
		if (mod->taints & ~((1 << TAINT_OOT_MODULE) \| (1 << TAINT_CRAP)))
		return 0;
		mutex_lock(&tracepoints_mutex);
		tp_mod = kmalloc(sizeof(struct tp_module), GFP_KERNEL);

Admin message