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

Handle open() errors during log rotation, found by Coverity Scan

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2019-11-05 11:04:44 +01:00
parent 0bf36c59a6
commit 3c2c353c37
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/syslogd.c
View File

@@ -1362,8 +1362,8 @@ static void logmsg(struct buf_msg *buffer)
/* log the message to the particular outputs */ /* log the message to the particular outputs */
if (!Initialized) { if (!Initialized) {
f = &consfile; f = &consfile;
f->f_file = open(ctty, O_WRONLY | O_NOCTTY);
f->f_file = open(ctty, O_WRONLY | O_NOCTTY);
if (f->f_file >= 0) { if (f->f_file >= 0) {
untty(); untty();
fprintlog(f, buffer); fprintlog(f, buffer);
@@ -1507,7 +1507,15 @@ void logrotate(struct filed *f)
sprintf(newFile, "%s.0", f->f_un.f_fname); sprintf(newFile, "%s.0", f->f_un.f_fname);
(void)rename(f->f_un.f_fname, newFile); (void)rename(f->f_un.f_fname, newFile);
close(f->f_file); close(f->f_file);
f->f_file = open(f->f_un.f_fname, O_WRONLY | O_APPEND | O_CREAT | O_NONBLOCK | O_NOCTTY, 0644); f->f_file = open(f->f_un.f_fname, O_WRONLY | O_APPEND | O_CREAT | O_NONBLOCK | O_NOCTTY, 0644);
if (f->f_file < 0) {
f->f_type = F_UNUSED;
logerror("Failed re-opening log file after rotation");
errno = 0;
logerror(f->f_un.f_fname);
return;
}
} }
ftruncate(f->f_file, 0); ftruncate(f->f_file, 0);
} }