svn commit: r300469 - stable/10/usr.sbin/rpc.statd

[Don Lewis]

Author: truckman
Date: Mon May 23 05:38:40 2016
New Revision: 300469
URL: https://svnweb.freebsd.org/changeset/base/300469

Log:
  MFC r299988
  
  Set ai2 to NULL in in find_host() before the loop and after calling
  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
  Differential Revision:	https://reviews.freebsd.org/D6398

Modified:
  stable/10/usr.sbin/rpc.statd/file.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rpc.statd/file.c
==============================================================================
--- stable/10/usr.sbin/rpc.statd/file.c	Mon May 23 05:37:45 2016	(r300468)
+++ stable/10/usr.sbin/rpc.statd/file.c	Mon May 23 05:38:40 2016	(r300469)
@@ -82,6 +82,7 @@ HostInfo *find_host(char *hostname, int 
   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 
       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 
        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 
     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);