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

Set ai2 to NULL in in find_host() before the loop and after calling

Browse Source 
freeaddrinfo() on it to indicate that it doesn't point to a valid
addrinfo list.  This fixes this Coverity issues:
	1006368 Uninitialized pointer read
	1018506 Double free
	1305590 Resource leak
that can be triggered in the hp->hostname[0] != '\0' case.

Don't treat a character as a boolean.

Fix these Coverity issues:
	1009293 Unchecked return value from library
	1194246 Wrong size argument
by tweaking the status file extend code.

Reported by:	Coverity
CID:		1006368, 1018506, 1305590, 1009293, 1194246
Reviewed by:	rmacklem
Feedback from:	hrs
MFC after:	1 week
Differential Revision:	D6398
This commit is contained in:
Don Lewis 2016-05-16 23:29:04 +00:00
parent b6ecea3082
commit 010e93758f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/rpc.statd/file.c
View File

@ -82,6 +82,7 @@ HostInfo *find_host(char *hostname, int create)
struct addrinfo *ai1, *ai2;
int i;
ai2 = NULL;
if (getaddrinfo(hostname, NULL, NULL, &ai1) != 0)
ai1 = NULL;
for (i = 0, hp = status_info->hosts; i < status_info->noOfHosts; i++, hp++)
@ -91,7 +92,7 @@ HostInfo *find_host(char *hostname, int create)
result = hp;
break;
}
if (hp->hostname[0] &&
if (hp->hostname[0] != '\0' &&
getaddrinfo(hp->hostname, NULL, NULL, &ai2) != 0)
ai2 = NULL;
if (ai1 && ai2)
@ -113,8 +114,10 @@ HostInfo *find_host(char *hostname, int create)
if (result)
break;
}
if (ai2)
if (ai2) {
freeaddrinfo(ai2);
ai2 = NULL;
}
if (!spare_slot && !hp->monList && !hp->notifyReqd)
spare_slot = hp;
}
@ -134,9 +137,8 @@ HostInfo *find_host(char *hostname, int create)
if (desired_size > status_file_len)
{
/* Extend file by writing 1 byte of junk at the desired end pos */
lseek(status_fd, desired_size - 1, SEEK_SET);
i = write(status_fd, &i, 1);
if (i < 1)
if (lseek(status_fd, desired_size - 1, SEEK_SET) == -1 ||
write(status_fd, "\0", 1) < 0)
{
syslog(LOG_ERR, "Unable to extend status file");
return (NULL);