emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libsyslog: enforce 32 char limit on RFC3164 output to remote syslogd

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg 2022-07-31 18:48:39 +02:00
parent 50f6ad74cb
commit 43d8640aac
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/syslog.c
View File

@ -266,6 +266,9 @@ vsyslogp_r(int pri, struct syslog_data *data, const char *msgid,
/* Default log format is RFC5424, continues below BSD format */ /* Default log format is RFC5424, continues below BSD format */
if (data->log_stat & LOG_RFC3164) { if (data->log_stat & LOG_RFC3164) {
const char *tag = data->log_tag;
char tmp[33];
if (!(data->log_stat & LOG_NLOG)) { if (!(data->log_stat & LOG_NLOG)) {
prlen = snprintf(p, tbuf_left, "<%d>", pri); prlen = snprintf(p, tbuf_left, "<%d>", pri);
DEC(); DEC();
@ -298,11 +301,21 @@ vsyslogp_r(int pri, struct syslog_data *data, const char *msgid,
if (data->log_pid == -1) if (data->log_pid == -1)
data->log_pid = getpid(); data->log_pid = getpid();
/*
* When sending remote we MUST follow RFC3164 sec 4.1.3,
* otherwise we "cheat" and allow max lenght hostname,
* for either log file or local syslogd -- it is up to
* the local syslogd then to fulfill RFC req. on output
*/
if (data->log_host) {
strlcpy(tmp, data->log_tag, sizeof(tbuf));
tag = tmp;
}
if (data->log_stat & LOG_PID) if (data->log_stat & LOG_PID)
prlen = snprintf(p, tbuf_left, "%s[%d]: ", data->log_tag, prlen = snprintf(p, tbuf_left, "%s[%d]: ", tag, data->log_pid);
data->log_pid);
else else
prlen = snprintf(p, tbuf_left, "%s: ", data->log_tag); prlen = snprintf(p, tbuf_left, "%s: ", tag);
if (data->log_stat & (LOG_PERROR|LOG_CONS|LOG_NLOG)) { if (data->log_stat & (LOG_PERROR|LOG_CONS|LOG_NLOG)) {
iov[iovcnt].iov_base = p; iov[iovcnt].iov_base = p;