svn commit: r301582 - head/bin/setfacl

Don Lewis truckman at FreeBSD.org
Wed Jun 8 05:32:41 UTC 2016


Author: truckman
Date: Wed Jun  8 05:32:39 2016
New Revision: 301582
URL: https://svnweb.freebsd.org/changeset/base/301582

Log:
  Explicitly NUL terminate the buffer filled by fread().
  
  The fix in r300649 was not sufficient to convince Coverity that the
  buffer was NUL terminated, even with the buffer pre-zeroed.  Swap
  the size and nmemb arguments to fread() so that a valid lenght is
  returned, which we can use to terminate the string in the buffer
  at the correct location.  This should also quiet the complaint about
  the return value of fread() not being checked.
  
  Reported by:	Coverity
  CID:		1019054, 1009614
  MFC after:	1 week

Modified:
  head/bin/setfacl/file.c

Modified: head/bin/setfacl/file.c
==============================================================================
--- head/bin/setfacl/file.c	Wed Jun  8 04:49:20 2016	(r301581)
+++ head/bin/setfacl/file.c	Wed Jun  8 05:32:39 2016	(r301582)
@@ -43,13 +43,12 @@ acl_t
 get_acl_from_file(const char *filename)
 {
 	FILE *file;
+	size_t len;
 	char buf[BUFSIZ+1];
 
 	if (filename == NULL)
 		err(1, "(null) filename in get_acl_from_file()");
 
-	bzero(&buf, sizeof(buf));
-
 	if (strcmp(filename, "-") == 0) {
 		if (have_stdin != 0)
 			err(1, "cannot specify more than one stdin");
@@ -61,7 +60,8 @@ get_acl_from_file(const char *filename)
 			err(1, "fopen() %s failed", filename);
 	}
 
-	fread(buf, sizeof(buf) - 1, (size_t)1, file);
+	len = fread(buf, (size_t)1, sizeof(buf) - 1, file);
+	buf[len] = '\0';
 	if (ferror(file) != 0) {
 		fclose(file);
 		err(1, "error reading from %s", filename);


More information about the svn-src-all mailing list