Date: Sat, 14 Nov 2009 18:53:44 +0000 (UTC) From: Robert Noland <rnoland@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r199276 - stable/7/sys/cddl/boot/zfs Message-ID: <200911141853.nAEIriJA010422@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911141853.nAEIriJA010422>