aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2012-06-22 21:12:19 (GMT)
committerAntti Palosaari <crope@iki.fi>2012-07-03 19:57:24 (GMT)
commit3c567be19115387899a9e756a3cf2d3d8341885d (patch)
tree79e4f98da02bea92f9ab470df9a4ebdd532293dd
parent3546843360ad9ff015a8fda9a618b5776d42030c (diff)
printk: fix regression in SYSLOG_ACTION_CLEAR
Commit 7ff9554bb578ba02166071d2d487b7fc7d860d62 (printk: convert byte-buffer to variable-length record buffer) introduced a regression by accidentally removing a "break" statement from inside the big switch in printk's do_syslog(). The symptom of this bug is that the "dmesg -C" command doesn't only clear the kernel's log buffer; it also disables console logging. This patch (as1561) fixes the regression by adding the missing "break". Signed-off-by: Alan Stern <stern@rowland.harvard.edu> CC: Kay Sievers <kay@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/printk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index a2276b9..d6a1412 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1040,6 +1040,7 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
/* Clear ring buffer */
case SYSLOG_ACTION_CLEAR:
syslog_print_all(NULL, 0, true);
+ break;
/* Disable logging to console */
case SYSLOG_ACTION_CONSOLE_OFF:
if (saved_console_loglevel == -1)

Privacy Policy