From: NeilBrown <neilb@suse.de>
Date: Thu, 17 May 2012 05:46:09 +0000 (+1000)
Subject: RebuildMap: check that container_content returns a valid 'info'.
X-Git-Tag: mdadm-3.2.5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccced50fba17bc46277419b733361182fdfee5da;p=thirdparty%2Fmdadm.git

RebuildMap: check that container_content returns a valid 'info'.

If it doesn't, just skip that entry.

Reported-by: Maciej Naruszewicz <maciej.naruszewicz@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/mapfile.c b/mapfile.c
index b890ed2b..70ff3558 100644
--- a/mapfile.c
+++ b/mapfile.c
@@ -404,6 +404,8 @@ void RebuildMap(void)
 			if (ok != 0)
 				continue;
 			info = st->ss->container_content(st, subarray);
+			if (!info)
+				continue;
 
 			if (md->devnum >= 0)
 				path = map_dev(MD_MAJOR, md->devnum, 0);