The patch titled
list module taint flags in Oops/panic
has been added to the -mm tree. Its filename is
list-module-taint-flags-in-oops-panic.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: list module taint flags in Oops/panic
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
When listing loaded modules during an oops or panic, also list each
module's Tainted flags if non-zero (P: Proprietary or F: Forced load only).
If a module is did not taint the kernel, it is just listed like
usbcore
but if it did taint the kernel, it is listed like
wizmodem(PF)
Example:
[ 3260.121718] Unable to handle kernel NULL pointer dereference at 0000000000000000 RIP:
[ 3260.121729] [<ffffffff8804c099>] :dump_test:proc_dump_test+0x99/0xc8
[ 3260.121742] PGD fe8d067 PUD 264a6067 PMD 0
[ 3260.121748] Oops: 0002 [1] SMP
[ 3260.121753] CPU 1
[ 3260.121756] Modules linked in: dump_test(P) snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device ide_cd generic ohci1394 snd_hda_intel snd_hda_codec snd_pcm snd_timer snd ieee1394 snd_page_alloc piix ide_core arcmsr aic79xx scsi_transport_spi usblp
[ 3260.121785] Pid: 5556, comm: bash Tainted: P 2.6.18-git10 #1
[Alternatively, I can look into listing tainted flags with 'lsmod',
but that won't help in oopsen/panics so much.]
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/module.h | 2 ++
kernel/module.c | 36 +++++++++++++++++++++++++++++++++---
2 files changed, 35 insertions(+), 3 deletions(-)
diff -puN include/linux/module.h~list-module-taint-flags-in-oops-panic include/linux/module.h
--- a/include/linux/module.h~list-module-taint-flags-in-oops-panic
+++ a/include/linux/module.h
@@ -327,6 +327,8 @@ struct module
unsigned num_bugs;
#endif
+ unsigned int taints; /* same bits as kernel:tainted */
+
#ifdef CONFIG_MODULE_UNLOAD
/* Reference counts */
struct module_ref ref[NR_CPUS];
diff -puN kernel/module.c~list-module-taint-flags-in-oops-panic kernel/module.c
--- a/kernel/module.c~list-module-taint-flags-in-oops-panic
+++ a/kernel/module.c
@@ -851,6 +851,7 @@ static int check_version(Elf_Shdr *sechd
printk("%s: no version for \"%s\" found: kernel tainted.\n",
mod->name, symname);
add_taint(TAINT_FORCED_MODULE);
+ mod->taints |= TAINT_FORCED_MODULE;
}
return 1;
}
@@ -1339,6 +1340,7 @@ static void set_license(struct module *m
printk(KERN_WARNING "%s: module license '%s' taints kernel.\n",
mod->name, license);
add_taint(TAINT_PROPRIETARY_MODULE);
+ mod->taints |= TAINT_PROPRIETARY_MODULE;
}
}
@@ -1618,6 +1620,7 @@ static struct module *load_module(void _
/* This is allowed: modprobe --force will invalidate it. */
if (!modmagic) {
add_taint(TAINT_FORCED_MODULE);
+ mod->taints |= TAINT_FORCED_MODULE;
printk(KERN_WARNING "%s: no version magic, tainting kernel.\n",
mod->name);
} else if (!same_magic(modmagic, vermagic)) {
@@ -1711,10 +1714,14 @@ static struct module *load_module(void _
/* Set up license info based on the info section */
set_license(mod, get_modinfo(sechdrs, infoindex, "license"));
- if (strcmp(mod->name, "ndiswrapper") == 0)
+ if (strcmp(mod->name, "ndiswrapper") == 0) {
add_taint(TAINT_PROPRIETARY_MODULE);
- if (strcmp(mod->name, "driverloader") == 0)
+ mod->taints |= TAINT_PROPRIETARY_MODULE;
+ }
+ if (strcmp(mod->name, "driverloader") == 0) {
add_taint(TAINT_PROPRIETARY_MODULE);
+ mod->taints |= TAINT_PROPRIETARY_MODULE;
+ }
/* Set up MODINFO_ATTR fields */
setup_modinfo(mod, sechdrs, infoindex);
@@ -1760,6 +1767,7 @@ static struct module *load_module(void _
printk(KERN_WARNING "%s: No versions for exported symbols."
" Tainting kernel.\n", mod->name);
add_taint(TAINT_FORCED_MODULE);
+ mod->taints |= TAINT_FORCED_MODULE;
}
#endif
@@ -2227,6 +2235,28 @@ struct module *module_text_address(unsig
return mod;
}
+static char *taint_flags(unsigned int taints)
+{
+ static char buf[8];
+ int bx;
+
+ if (!taints)
+ return "";
+
+ buf[0] = '(';
+ bx = 1;
+ if (taints & TAINT_PROPRIETARY_MODULE)
+ buf [bx++] = 'P';
+ if (taints & TAINT_FORCED_MODULE)
+ buf [bx++] = 'F';
+ /* TAINT_FORCED_RMMOD: could be added */
+ /* TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE
+ * don't apply to modules */
+ buf[bx] = ')';
+
+ return buf;
+}
+
/* Don't grab lock, we're oopsing. */
void print_modules(void)
{
@@ -2234,7 +2264,7 @@ void print_modules(void)
printk("Modules linked in:");
list_for_each_entry(mod, &modules, list)
- printk(" %s", mod->name);
+ printk(" %s%s", mod->name, taint_flags(mod->taints));
printk("\n");
}
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
origin.patch
git-acpi.patch
acpi-fix-printk-format-warnings.patch
drivers-media-use-null-instead-of-0-for-ptrs.patch
git-lxdialog.patch
mtd-printk-format-warning.patch
git-net.patch
pcmcia-ds-must_check-fixes.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
tiacx-sparse-cleanups.patch
kernel-params-must_check-fixes.patch
blockdevc-check-errors.patch
block-handle-subsystem_register-init-errors.patch
fs-namespace-handle-init-registration-errors.patch
kernel-doc-for-relay-interface.patch
kernel-doc-move-filesystems-together.patch
include-documentation-for-functions-in-drivers-base-classc.patch
fix-parameter-names-in-drivers-base-classc.patch
fix-kerneldoc-comments-in-kernel-timerc-fix.patch
cdev-documentation-was-drop-second-arg-of-unregister_chrdev.patch
docbook-fix-segfault-in-docprocc.patch
doc-fix-kernel-parameters-quiet.patch
mention-documenation-abi-requirements-in-documentation-submitchecklist.patch
allow-proc-configgz-to-be-built-as-a-module.patch
lib-add-gen_pool_destroy.patch
make-genpool-allocator-adhere-to-kernel-doc-standards.patch
list-module-taint-flags-in-oops-panic.patch
list-module-taint-flags-in-oops-panic-tidy.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.patch
ecryptfs-fix-printk-format-warnings.patch
ide-core-must_check-fixes.patch
documentation-fixes-in-intel810txt.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
