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.wil...@delphix.com>
  Reviewed by: Matthew Ahrens <mahr...@delphix.com>
  Reviewed by: Dan McDonald <dan...@omniti.com>
  Approved by: Gordon Ross <g...@nexenta.com>
  
  illumos/illumos-gate@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;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to