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

Fix various Coverity issues in sbin/savecore/savecore.c:

Browse Source 
CID1009429: Fix unchecked return value from lseek while clearing dump
CID1007781: Fix file descriptor leak in DoFile
CID1007261: Don't send potentially unterminated string to syslog(3)

Coverity CID:	1009429
Coverity CID:	1007781
Coverity CID:	1007261
MFC after:	2 weeks
Sponsored by:	Spectra Logic
Differential Revision:	https://reviews.freebsd.org/D3991
This commit is contained in:
Alan Somers 2015-10-23 19:28:24 +00:00
parent c98d2b1f1e
commit 6123d3f697
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbin/savecore/savecore.c
View File

@ -606,7 +606,8 @@ DoFile(const char *savedir, const char *device)
}
if (kdhl.panicstring[0])
syslog(LOG_ALERT, "reboot after panic: %s", kdhl.panicstring);
syslog(LOG_ALERT, "reboot after panic: %*s",
(int)sizeof(kdhl.panicstring), kdhl.panicstring);
else
syslog(LOG_ALERT, "reboot");
@ -657,7 +658,7 @@ DoFile(const char *savedir, const char *device)
if (info == NULL) {
syslog(LOG_ERR, "fdopen failed: %m");
nerr++;
goto closefd;
goto closeall;
}
xostyle = xo_get_style(NULL);
@ -665,7 +666,7 @@ DoFile(const char *savedir, const char *device)
if (xoinfo == NULL) {
syslog(LOG_ERR, "%s: %m", infoname);
nerr++;
goto closefd;
goto closeall;
}
xo_open_container_h(xoinfo, "crashdump");
@ -726,9 +727,8 @@ DoFile(const char *savedir, const char *device)
if (verbose)
printf("clearing dump header\n");
memcpy(kdhl.magic, KERNELDUMPMAGIC_CLEARED, sizeof kdhl.magic);
lseek(fd, lasthd, SEEK_SET);
error = write(fd, &kdhl, sizeof kdhl);
if (error != sizeof kdhl)
if (lseek(fd, lasthd, SEEK_SET) != lasthd ||
write(fd, &kdhl, sizeof(kdhl)) != sizeof(kdhl))
syslog(LOG_ERR,
"error while clearing the dump header: %m");
}