diff options
| author | dim <dim@FreeBSD.org> | 2016-01-15 21:45:53 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-01-15 21:45:53 +0000 |
| commit | ec70d0382b4b6cac7a6be6a753063993df819bec (patch) | |
| tree | e244172f1c27ad76aee5e70fd5d00d9c7fba5da1 /sys/cddl | |
| parent | 12fce57c8cb14423ce57f4c67d69098043e1dab8 (diff) | |
| download | FreeBSD-src-ec70d0382b4b6cac7a6be6a753063993df819bec.zip FreeBSD-src-ec70d0382b4b6cac7a6be6a753063993df819bec.tar.gz | |
MFV r294101: 6527 Possible access beyond end of string in zpool comment
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Gordon Ross <gwr@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
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c index 29d2c90..b7801ac 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -610,7 +610,6 @@ spa_prop_validate(spa_t *spa, nvlist_t *props) error = SET_ERROR(EINVAL); break; } - check++; } if (strlen(strval) > ZPROP_MAX_COMMENT) error = E2BIG; |
