From owner-svn-src-head@FreeBSD.ORG  Mon May 20 00:33:55 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 856C9942;
 Mon, 20 May 2013 00:33:55 +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 74DE9FC9;
 Mon, 20 May 2013 00:33:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4K0Xs0E014493;
 Mon, 20 May 2013 00:33:54 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4K0XspA014492;
 Mon, 20 May 2013 00:33:54 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201305200033.r4K0XspA014492@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 20 May 2013 00:33:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250819 - head/sys/geom/raid
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 May 2013 00:33:55 -0000

Author: mav
Date: Mon May 20 00:33:54 2013
New Revision: 250819
URL: http://svnweb.freebsd.org/changeset/base/250819

Log:
  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.
  
  Reported by:	trasz
  MFC after:	1 week

Modified:
  head/sys/geom/raid/md_ddf.c

Modified: head/sys/geom/raid/md_ddf.c
==============================================================================
--- head/sys/geom/raid/md_ddf.c	Sun May 19 23:30:24 2013	(r250818)
+++ head/sys/geom/raid/md_ddf.c	Mon May 20 00:33:54 2013	(r250819)
@@ -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;