aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-05-09 02:25:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-09 10:45:18 -0400
commit91e37a793b5a9436a2d12b2f0a8f52db3a133e1d (patch)
tree6ddf17ad786fa2a42ef79aa4f7873c79c1e17a89 /init
parenta5dd69707424a35d2d2cc094e870f595ad61e916 (diff)
module: don't ignore vermagic string if module doesn't have modversions
Linus found a logic bug: we ignore the version number in a module's vermagic string if we have CONFIG_MODVERSIONS set, but modversions also lets through a module with no __versions section for modprobe --force (with tainting, but still). We should only ignore the start of the vermagic string if the module actually *has* crcs to check. Rather than (say) having an entertaining hissy fit and creating a config option to work around the buggy code. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 3b5adbf228c7..6135d07f31ec 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -845,9 +845,9 @@ config MODULE_FORCE_LOAD
845 depends on MODULES 845 depends on MODULES
846 default n 846 default n
847 help 847 help
848 This option allows loading of modules even if that would set the 848 Allow loading of modules without version information (ie. modprobe
849 'F' (forced) taint, due to lack of version info. Which is 849 --force). Forced module loading sets the 'F' (forced) taint flag and
850 usually a really bad idea. 850 is usually a really bad idea.
851 851
852config MODULE_UNLOAD 852config MODULE_UNLOAD
853 bool "Module unloading" 853 bool "Module unloading"