diff --git a/kernel.spec b/kernel.spec index 8e2f35973..a04e18170 100644 --- a/kernel.spec +++ b/kernel.spec @@ -645,6 +645,7 @@ Patch09: linux-2.6-upstream-reverts.patch # Standalone patches +Patch100: taint-vbox.patch Patch160: linux-2.6-32bit-mmap-exec-randomization.patch Patch161: linux-2.6-i386-nx-emulation.patch @@ -1204,6 +1205,8 @@ ApplyOptionalPatch linux-2.6-compile-fixes.patch ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R +ApplyPatch taint-vbox.patch + # Architecture patches # x86(-64) ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch @@ -2049,6 +2052,9 @@ fi # ||----w | # || || %changelog +* Thu Oct 06 2011 Dave Jones +- Taint if virtualbox modules have been loaded. + * Wed Oct 05 2011 Josh Boyer - Linux 3.1-rc9 diff --git a/taint-vbox.patch b/taint-vbox.patch new file mode 100644 index 000000000..5cb3e47c9 --- /dev/null +++ b/taint-vbox.patch @@ -0,0 +1,15 @@ +diff --git a/kernel/module.c b/kernel/module.c +index 04379f92..d26c9a3 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2653,6 +2653,10 @@ static int check_module_license_and_versions(struct module *mod) + if (strcmp(mod->name, "ndiswrapper") == 0) + add_taint(TAINT_PROPRIETARY_MODULE); + ++ /* vbox is garbage. */ ++ if (strcmp(mod->name, "vboxdrv") == 0) ++ add_taint(TAINT_CRAP); ++ + /* driverloader was caught wrongly pretending to be under GPL */ + if (strcmp(mod->name, "driverloader") == 0) + add_taint_module(mod, TAINT_PROPRIETARY_MODULE);