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

Fix a buffer overflow in bootparamd(8)

Browse Source 
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
MFC after:	1 week
Sponsored by:	Spectra Logic Corp
This commit is contained in:
asomers 2017-05-24 16:30:38 +00:00
parent dc5c0f46d3
commit 13565abca5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/bootparamd/bootparamd/bootparamd.c
View File

@ -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 )
@ -251,8 +254,9 @@ int blen;
info of the file */
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) == '=') {