From owner-svn-src-stable-7@FreeBSD.ORG  Sat Nov 14 18:53:44 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C32A71065670;
	Sat, 14 Nov 2009 18:53:44 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B1A4A8FC12;
	Sat, 14 Nov 2009 18:53:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAEIriLE010423;
	Sat, 14 Nov 2009 18:53:44 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAEIriJA010422;
	Sat, 14 Nov 2009 18:53:44 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200911141853.nAEIriJA010422@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Sat, 14 Nov 2009 18:53:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199276 - stable/7/sys/cddl/boot/zfs
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Nov 2009 18:53:44 -0000

Author: rnoland
Date: Sat Nov 14 18:53:44 2009
New Revision: 199276
URL: http://svn.freebsd.org/changeset/base/199276

Log:
  MFC r199241
  
  This patch addresses an overflow in the the zfs boot code and allows
  users to boot from zfs raidz volumes.  This has been tested by a number
  of users and does not impact those which are not booting from zfs raidz
  volumes.
  
  Submitted by:	Matt Reimer <mattjreimer@gmail.com>

Modified:
  stable/7/sys/cddl/boot/zfs/zfssubr.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/cddl/boot/zfs/zfssubr.c
==============================================================================
--- stable/7/sys/cddl/boot/zfs/zfssubr.c	Sat Nov 14 18:42:09 2009	(r199275)
+++ stable/7/sys/cddl/boot/zfs/zfssubr.c	Sat Nov 14 18:53:44 2009	(r199276)
@@ -550,7 +550,8 @@ vdev_raidz_read(vdev_t *vdev, const blkp
 	uint64_t s = psize >> unit_shift;
 	uint64_t f = b % dcols;
 	uint64_t o = (b / dcols) << unit_shift;
-	int q, r, c, c1, bc, col, acols, coff, devidx, asize, n;
+	uint64_t q, r, coff;
+	int c, c1, bc, col, acols, devidx, asize, n;
 	static raidz_col_t cols[16];
 	raidz_col_t *rc, *rc1;