]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
RebuildMap: check that container_content returns a valid 'info'.
authorNeilBrown <neilb@suse.de>
Thu, 17 May 2012 05:46:09 +0000 (15:46 +1000)
committerNeilBrown <neilb@suse.de>
Thu, 17 May 2012 05:46:09 +0000 (15:46 +1000)
If it doesn't, just skip that entry.

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

index b890ed2b56a9925bf5599e3a84f210a166ad40dc..70ff3558361bf543db55c0fcb7e9042e22386820 100644 (file)
--- 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);