From owner-svn-src-head@FreeBSD.ORG  Thu Mar  7 18:55:38 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5E1A3A36;
 Thu,  7 Mar 2013 18:55:38 +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 5114FCE5;
 Thu,  7 Mar 2013 18:55:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r27ItbAX067581;
 Thu, 7 Mar 2013 18:55:37 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r27ItbM9067580;
 Thu, 7 Mar 2013 18:55:37 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201303071855.r27ItbM9067580@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 7 Mar 2013 18:55:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247918 - 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: Thu, 07 Mar 2013 18:55:38 -0000

Author: mav
Date: Thu Mar  7 18:55:37 2013
New Revision: 247918
URL: http://svnweb.freebsd.org/changeset/base/247918

Log:
  Fix panic when Secondary_Element_Count == 1 and Secondary_Element_Seq
  is not set (255).
  
  Reported by:	sbruno
  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	Thu Mar  7 16:50:07 2013	(r247917)
+++ head/sys/geom/raid/md_ddf.c	Thu Mar  7 18:55:37 2013	(r247918)
@@ -881,7 +881,10 @@ ddf_vol_meta_update(struct ddf_vol_meta 
 	hdr = src->hdr;
 	vde = &src->vdr->entry[ddf_meta_find_vd(src, GUID)];
 	vdc = ddf_meta_find_vdc(src, GUID);
-	bvd = GET8D(src, vdc->Secondary_Element_Seq);
+	if (GET8D(src, vdc->Secondary_Element_Count) == 1)
+		bvd = 0;
+	else
+		bvd = GET8D(src, vdc->Secondary_Element_Seq);
 	size = GET16(src, hdr->Configuration_Record_Length) * src->sectorsize;
 
 	if (dst->vdc == NULL ||