summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-10-26 13:10:39 +1030
committerRusty Russell <rusty@rustcorp.com.au>2011-10-26 13:10:39 +1030
commit37252db6aa576c34fd794a5a54fb32d7a8b3a07a (patch)
tree2c4c83ec064a1352d8888e2e3641a9f2b1b72c03
parentc3b92c8787367a8bb53d57d9789b558f1295cc96 (diff)
downloadlinux-3.10-37252db6aa576c34fd794a5a54fb32d7a8b3a07a.tar.gz
linux-3.10-37252db6aa576c34fd794a5a54fb32d7a8b3a07a.tar.bz2
linux-3.10-37252db6aa576c34fd794a5a54fb32d7a8b3a07a.zip
kmod: prevent kmod_loop_msg overflow in __request_module()
Due to post-increment in condition of kmod_loop_msg in __request_module(), the system log can be spammed by much more than 5 instances of the 'runaway loop' message if the number of events triggering it makes the kmod_loop_msg to overflow. Fix that by making sure we never increment it past the threshold. Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> CC: stable@kernel.org
-rw-r--r--kernel/kmod.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c
index ddc7644c130..a4bea97c75b 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -114,10 +114,12 @@ int __request_module(bool wait, const char *fmt, ...)
atomic_inc(&kmod_concurrent);
if (atomic_read(&kmod_concurrent) > max_modprobes) {
/* We may be blaming an innocent here, but unlikely */
- if (kmod_loop_msg++ < 5)
+ if (kmod_loop_msg < 5) {
printk(KERN_ERR
"request_module: runaway loop modprobe %s\n",
module_name);
+ kmod_loop_msg++;
+ }
atomic_dec(&kmod_concurrent);
return -ENOMEM;
}