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

[Michael Tokarev]

Module: mdadm
Branch: master
Commit: ccced50fba17bc46277419b733361182fdfee5da
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=ccced50fba17bc46277419b733361182fdfee5da

Author: NeilBrown <neilb at suse.de>
Date:   Thu May 17 15:46:09 2012 +1000

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

If it doesn't, just skip that entry.

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

---

 mapfile.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/mapfile.c b/mapfile.c
index b890ed2..70ff355 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);