svn commit: r294102 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Dimitry Andric dim at FreeBSD.org
Fri Jan 15 21:45:54 UTC 2016


Author: dim
Date: Fri Jan 15 21:45:53 2016
New Revision: 294102
URL: https://svnweb.freebsd.org/changeset/base/294102

Log:
  MFV r294101: 6527 Possible access beyond end of string in zpool comment
  
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Dan McDonald <danmcd at omniti.com>
  Approved by: Gordon Ross <gwr at nexenta.com>
  
  illumos/illumos-gate at 2bd7a8d078223b122d65fea49bb8641f858b1409
  
  This fixes erroneous double increments of the 'check' variable in a loop
  in spa_prop_validate().  I ran into this in the clang380-import branch,
  where clang 3.8.0 warns about it.  (It is already fixed there.)
  
  MFC after:	3 days

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Fri Jan 15 21:41:45 2016	(r294101)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Fri Jan 15 21:45:53 2016	(r294102)
@@ -610,7 +610,6 @@ spa_prop_validate(spa_t *spa, nvlist_t *
 					error = SET_ERROR(EINVAL);
 					break;
 				}
-				check++;
 			}
 			if (strlen(strval) > ZPROP_MAX_COMMENT)
 				error = E2BIG;


More information about the svn-src-all mailing list