svn commit: r320676 - stable/11/usr.sbin/bootparamd/bootparamd
Alan Somers
asomers at FreeBSD.org
Wed Jul 5 15:31:43 UTC 2017
Author: asomers
Date: Wed Jul 5 15:31:42 2017
New Revision: 320676
URL: https://svnweb.freebsd.org/changeset/base/320676
Log:
MFC r318790, r319336
r318790:
Fix a buffer overflow in bootparamd(8)
If /etc/bootparams contains a line with an excessively long pathname, and a
client asks for that path, then bootparamd will overflow a buffer and crash
while parsing that line. This is not remotely exploitable since it requires
a malformed /etc/bootparams file.
Reported by: Coverity
CID: 1305954
Sponsored by: Spectra Logic Corp
r319336:
Fix uninitialized variable in bootparamd.c
Restore line that was accidentally deleted in change 318790
Reported by: Coverity
CID: 1375855
X-MFC-With: 318790
Sponsored by: Spectra Logic Corp
Modified:
stable/11/usr.sbin/bootparamd/bootparamd/bootparamd.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/bootparamd/bootparamd/bootparamd.c
==============================================================================
--- stable/11/usr.sbin/bootparamd/bootparamd/bootparamd.c Wed Jul 5 15:23:30 2017 (r320675)
+++ stable/11/usr.sbin/bootparamd/bootparamd/bootparamd.c Wed Jul 5 15:31:42 2017 (r320676)
@@ -199,7 +199,10 @@ int blen;
int ch, pch, fid_len, res = 0;
int match = 0;
- char info[MAX_FILEID + MAX_PATH_LEN+MAX_MACHINE_NAME + 3];
+#define INFOLEN 1343
+ _Static_assert(INFOLEN >= MAX_FILEID + MAX_PATH_LEN+MAX_MACHINE_NAME + 3,
+ "INFOLEN isn't large enough");
+ char info[INFOLEN + 1];
bpf = fopen(bootpfile, "r");
if ( ! bpf )
@@ -252,7 +255,9 @@ int blen;
if (match) {
fid_len = strlen(fileid);
- while ( ! res && (fscanf(bpf,"%s", info)) > 0) { /* read a string */
+#define AS_FORMAT(d) "%" #d "s"
+#define REXPAND(d) AS_FORMAT(d) /* Force another preprocessor expansion */
+ while ( ! res && (fscanf(bpf, REXPAND(INFOLEN), info)) > 0) {
ch = getc(bpf); /* and a character */
if ( *info != '#' ) { /* Comment ? */
if (! strncmp(info, fileid, fid_len) && *(info + fid_len) == '=') {
More information about the svn-src-stable-11
mailing list