d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be much more strict about parsing tagged log messages from /dev/klog;

Browse Source 
if the line doesn't match ^<%d>, then treat it as a regular kernel
printf line. Previously if a kernel printf message started with "<"
it would be interpreted as a log message, often with LOG_EMERG
level. This was triggered by some printfs in sys/dev/aic7xxx/, and
can also happen with the partial lines that result if syslogd cannot
keep up with the rate of arrival of kernel messages.

Reviewed by:	dwmalone
MFC after:	1 week
This commit is contained in:
iedowse 2004-01-26 00:46:46 +00:00
parent 4d06b09564
commit 2fed042896
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
usr.sbin/syslogd/syslogd.c
View File

@ -734,24 +734,34 @@ readklog(void)
* Take a raw input line from /dev/klog, format similar to syslog().
*/
static void
printsys(char *p)
printsys(char *msg)
{
int pri, flags;
char *p;
int flags, isprintf, n, pri;
flags = ISKERNEL | SYNC_FILE | ADDDATE; /* fsync after write */
pri = DEFSPRI;
p = msg;
isprintf = 1;
if (*p == '<') {
pri = 0;
n = 0;
while (isdigit(*++p))
pri = 10 * pri + (*p - '0');
if (*p == '>')
n = 10 * n + (*p - '0');
if (*p == '>') {
++p;
if ((pri & LOG_FACMASK) == LOG_CONSOLE)
flags |= IGN_CONS;
} else {
/* kernel printf's come out on console */
flags |= IGN_CONS;
pri = n;
isprintf = 0;
} else {
/* It wasn't actually a syslog message. */
p = msg;
}
}
/*
* Kernel printf's and LOG_CONSOLE messages have been displayed
* on the console already.
*/
if (isprintf || (pri & LOG_FACMASK) == LOG_CONSOLE)
flags |= IGN_CONS;
if (pri &~ (LOG_FACMASK|LOG_PRIMASK))
pri = DEFSPRI;
logmsg(pri, p, LocalHostName, flags);