Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree

Browse source 
Use of the GPL or a compatible licence doesn't necessarily make the code
any good.  We already consider staging modules to be suspect, and this
should also be true for out-of-tree modules which may receive very
little review.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Reviewed-by: Dave Jones <davej@redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (patched oops-tracing.txt)
This commit is contained in:
Ben Hutchings 2011-10-24 15:12:28 +02:00 committed by Rusty Russell
parent 1cd0d6c302
commit 2449b8ba07
5 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/oops-tracing.txt
View file

@ -263,6 +263,8 @@ characters, each representing a particular tainted value.
12: 'I' if the kernel is working around a severe bug in the platform 12: 'I' if the kernel is working around a severe bug in the platform
firmware (BIOS or similar). firmware (BIOS or similar).
13: 'O' if an externally-built ("out-of-tree") module has been loaded.
The primary reason for the 'Tainted: ' string is to tell kernel The primary reason for the 'Tainted: ' string is to tell kernel
debuggers if this is a clean kernel or if anything unusual has debuggers if this is a clean kernel or if anything unusual has
occurred. Tainting is permanent: even if an offending module is occurred. Tainting is permanent: even if an offending module is

1
include/linux/kernel.h
View file

@ -371,6 +371,7 @@ extern enum system_states {
#define TAINT_WARN 9 #define TAINT_WARN 9
#define TAINT_CRAP 10 #define TAINT_CRAP 10
#define TAINT_FIRMWARE_WORKAROUND 11 #define TAINT_FIRMWARE_WORKAROUND 11
#define TAINT_OOT_MODULE 12
extern const char hex_asc[]; extern const char hex_asc[];
#define hex_asc_lo(x) hex_asc[((x) & 0x0f)] #define hex_asc_lo(x) hex_asc[((x) & 0x0f)]

5
kernel/module.c
View file

@ -2487,6 +2487,9 @@ static int check_modinfo(struct module *mod, struct load_info *info)
return -ENOEXEC; return -ENOEXEC;
} }
if (!get_modinfo(info, "intree"))
add_taint_module(mod, TAINT_OOT_MODULE);
if (get_modinfo(info, "staging")) { if (get_modinfo(info, "staging")) {
add_taint_module(mod, TAINT_CRAP); add_taint_module(mod, TAINT_CRAP);
printk(KERN_WARNING "%s: module is from the staging directory," printk(KERN_WARNING "%s: module is from the staging directory,"
@ -3255,6 +3258,8 @@ static char *module_flags(struct module *mod, char *buf)
buf[bx++] = '('; buf[bx++] = '(';
if (mod->taints & (1 << TAINT_PROPRIETARY_MODULE)) if (mod->taints & (1 << TAINT_PROPRIETARY_MODULE))
buf[bx++] = 'P'; buf[bx++] = 'P';
else if (mod->taints & (1 << TAINT_OOT_MODULE))
buf[bx++] = 'O';
if (mod->taints & (1 << TAINT_FORCED_MODULE)) if (mod->taints & (1 << TAINT_FORCED_MODULE))
buf[bx++] = 'F'; buf[bx++] = 'F';
if (mod->taints & (1 << TAINT_CRAP)) if (mod->taints & (1 << TAINT_CRAP))

2
kernel/panic.c
View file

@ -177,6 +177,7 @@ static const struct tnt tnts[] = {
{ TAINT_WARN, 'W', ' ' }, { TAINT_WARN, 'W', ' ' },
{ TAINT_CRAP, 'C', ' ' }, { TAINT_CRAP, 'C', ' ' },
{ TAINT_FIRMWARE_WORKAROUND, 'I', ' ' }, { TAINT_FIRMWARE_WORKAROUND, 'I', ' ' },
{ TAINT_OOT_MODULE, 'O', ' ' },
}; };
/** /**
@ -194,6 +195,7 @@ static const struct tnt tnts[] = {
* 'W' - Taint on warning. * 'W' - Taint on warning.
* 'C' - modules from drivers/staging are loaded. * 'C' - modules from drivers/staging are loaded.
* 'I' - Working around severe firmware bug. * 'I' - Working around severe firmware bug.
* 'O' - Out-of-tree module has been loaded.
* *
* The string is overwritten by the next call to print_tainted(). * The string is overwritten by the next call to print_tainted().
*/ */

7
scripts/mod/modpost.c
View file

@ -1849,6 +1849,12 @@ static void add_header(struct buffer *b, struct module *mod)
buf_printf(b, "};\n"); buf_printf(b, "};\n");
} }
static void add_intree_flag(struct buffer *b, int is_intree)
{
if (is_intree)
buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
}
static void add_staging_flag(struct buffer *b, const char *name) static void add_staging_flag(struct buffer *b, const char *name)
{ {
static const char *staging_dir = "drivers/staging"; static const char *staging_dir = "drivers/staging";
@ -2169,6 +2175,7 @@ int main(int argc, char **argv)
buf.pos = 0; buf.pos = 0;
add_header(&buf, mod); add_header(&buf, mod);
add_intree_flag(&buf, !external_module);
add_staging_flag(&buf, mod->name); add_staging_flag(&buf, mod->name);
err |= add_versions(&buf, mod); err |= add_versions(&buf, mod);
add_depends(&buf, mod, modules); add_depends(&buf, mod, modules);