From owner-svn-src-all@FreeBSD.ORG  Wed May 29 04:12:53 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E4C77C51;
 Wed, 29 May 2013 04:12:53 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D700C248;
 Wed, 29 May 2013 04:12:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4T4CrwN096187;
 Wed, 29 May 2013 04:12:53 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4T4CrUS096186;
 Wed, 29 May 2013 04:12:53 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201305290412.r4T4CrUS096186@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 29 May 2013 04:12:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251094 - stable/9/sys/geom/raid
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 May 2013 04:12:54 -0000

Author: mav
Date: Wed May 29 04:12:53 2013
New Revision: 251094
URL: http://svnweb.freebsd.org/changeset/base/251094

Log:
  MFC r250819:
  Fix vdc->Secondary_Element_Count metadata field access from 16 to 8 bit.
  In some cases it could cause kernel panic during failed drive replacement.

Modified:
  stable/9/sys/geom/raid/md_ddf.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/geom/raid/md_ddf.c
==============================================================================
--- stable/9/sys/geom/raid/md_ddf.c	Wed May 29 04:10:57 2013	(r251093)
+++ stable/9/sys/geom/raid/md_ddf.c	Wed May 29 04:12:53 2013	(r251094)
@@ -515,7 +515,7 @@ ddf_meta_find_disk(struct ddf_vol_meta *
 	int i, bvd, pos;
 
 	i = 0;
-	for (bvd = 0; bvd < GET16(vmeta, vdc->Secondary_Element_Count); bvd++) {
+	for (bvd = 0; bvd < GET8(vmeta, vdc->Secondary_Element_Count); bvd++) {
 		if (vmeta->bvdc[bvd] == NULL) {
 			i += GET16(vmeta, vdc->Primary_Element_Count); // XXX
 			continue;