From 18c8ca8c2636b5ffec97b2b9d06cbce6c333fe28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 29 Jul 2008 22:33:38 -0700 Subject: [PATCH] --- yaml --- r: 107019 b: refs/heads/master c: 641de9d8f505db055d451b50e6e38117f84e79bb h: refs/heads/master i: 107017: 4f04d23d85b871cbf5c6a99d2e182493cf21f684 107015: 61fec917fdc8e9c6a15f045ef1d9c9bb05184cb6 v: v3 --- [refs] | 2 +- trunk/kernel/printk.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c4e2fcb0b5d3..83ce2a3af0aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f3d137e0d6cd470a4e404cbc67480a0febdb0b1 +refs/heads/master: 641de9d8f505db055d451b50e6e38117f84e79bb diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index a7f7559c5f6c..b51b1567bb55 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -1309,14 +1309,14 @@ void tty_write_message(struct tty_struct *tty, char *msg) #if defined CONFIG_PRINTK -DEFINE_RATELIMIT_STATE(printk_ratelimit_state, 5 * HZ, 10); /* * printk rate limiting, lifted from the networking subsystem. * - * This enforces a rate limit: not more than one kernel message - * every printk_ratelimit_jiffies to make a denial-of-service - * attack impossible. + * This enforces a rate limit: not more than 10 kernel messages + * every 5s to make a denial-of-service attack impossible. */ +DEFINE_RATELIMIT_STATE(printk_ratelimit_state, 5 * HZ, 10); + int printk_ratelimit(void) { return __ratelimit(&printk_ratelimit_state);