From: Jorgen Lundman <lundman@lundman.net>
Date: Wed, 27 Jan 2016 02:02:04 +0000 (-0800)
Subject: Illumos 6527 -  Possible access beyond end of string in zpool comment
X-Git-Tag: zfs-0.7.0-rc1~263
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b9ed698b4838a36daa591d08728a692095f8f01;p=zfs

Illumos 6527 -  Possible access beyond end of string in zpool comment

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>

References:
  https://www.illumos.org/issues/6527
  https://github.com/illumos/illumos-gate/commit/2bd7a8d

Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Chunwei Chen <tuxoko@gmail.com>
---

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index ea4eb9f9a..34a317fbe 100644
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -588,7 +588,6 @@ spa_prop_validate(spa_t *spa, nvlist_t *props)
 					error = SET_ERROR(EINVAL);
 					break;
 				}
-				check++;
 			}
 			if (strlen(strval) > ZPROP_MAX_COMMENT)
 				error = SET_ERROR(E2BIG);