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

newsyslog: Fix stack corruption when initializing a zipwork structure.

Browse Source 
This happens when compressing a previously uncompressed already-rotated
file, as happens when handling the 'p' flag in newsyslog.conf.  The file
name is stored in a flexible array member, so these structures cannot be
stack allocated.

Also make sure that we call change_attrs() and do_zipwork() in dry-run
mode; they handle this properly, contrary to the commit log message for
r327451.

CID:		1008168
Github PR:	https://github.com/freebsd/freebsd/pull/427
MFC after:	2 weeks
Submitted by:	Radek Brich (original version)
This commit is contained in:
Mark Johnston 2020-03-24 18:16:36 +00:00
parent ff4c0e6f83
commit faff7ddb00
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=359276
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.sbin/newsyslog/newsyslog.c
View File

@ -1829,17 +1829,23 @@ do_rotate(const struct conf_entry *ent)
else {
/* XXX - Ought to be checking for failure! */
(void)rename(zfile1, zfile2);
change_attrs(zfile2, ent);
if (ent->compress && !strlen(logfile_suffix)) {
/* compress old rotation */
struct zipwork_entry zwork;
}
change_attrs(zfile2, ent);
if (ent->compress && strlen(logfile_suffix) == 0) {
/* compress old rotation */
struct zipwork_entry *zwork;
size_t sz;
memset(&zwork, 0, sizeof(zwork));
zwork.zw_conf = ent;
zwork.zw_fsize = sizefile(zfile2);
strcpy(zwork.zw_fname, zfile2);
do_zipwork(&zwork);
}
sz = sizeof(*zwork) + strlen(zfile2) + 1;
zwork = calloc(1, sz);
if (zwork == NULL)
err(1, "calloc");
zwork->zw_conf = ent;
zwork->zw_fsize = sizefile(zfile2);
strcpy(zwork->zw_fname, zfile2);
do_zipwork(zwork);
free(zwork);
}
}