From b490649afd1d8ea25e39b440d4f2b03ef76663b2 Mon Sep 17 00:00:00 2001 From: mav Date: Thu, 14 Mar 2013 05:24:25 +0000 Subject: [PATCH] MFC r247918: Fix panic when Secondary_Element_Count == 1 and Secondary_Element_Seq is not set (255). git-svn-id: svn://svn.freebsd.org/base/stable/9@248263 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/geom/raid/md_ddf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/geom/raid/md_ddf.c b/sys/geom/raid/md_ddf.c index 7d4bd1ec0..c18a319c4 100644 --- a/sys/geom/raid/md_ddf.c +++ b/sys/geom/raid/md_ddf.c @@ -881,7 +881,10 @@ ddf_vol_meta_update(struct ddf_vol_meta *dst, struct ddf_meta *src, 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 || -- 2.45.0