summaryrefslogtreecommitdiffstats
path: root/mapfile.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-05-17 07:46:09 +0200
committerNeilBrown <neilb@suse.de>2012-05-17 07:46:09 +0200
commitccced50fba17bc46277419b733361182fdfee5da (patch)
tree2056e22a9d66b90e308c3cfbf4683b685f72602b /mapfile.c
parentDon't consider disks with a valid recovery offset as candidates for bumping u... (diff)
downloadmdadm-ccced50fba17bc46277419b733361182fdfee5da.tar.xz
mdadm-ccced50fba17bc46277419b733361182fdfee5da.zip
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>
Diffstat (limited to 'mapfile.c')
-rw-r--r--mapfile.c2
1 files changed, 2 insertions, 0 deletions
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);