From 4363fd80bcc9f85ed824228dee5e6350a8d73e18 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 26 May 2010 13:33:43 -0700 Subject: imsm: robustify recovery-start detection update_recovery_start() assumed that the out-of-sync disk would always be marked as IMSM_ORD_REBUILD in the disk_ord_tbl, but the segmentation fault reported by Andy proves otherwise. This might also be explained by an interrupted rebuild and the disk has not yet been marked missing. https://bugzilla.redhat.com/show_bug.cgi?id=592030 Reported-by: Andy Lutomirski Signed-off-by: Dan Williams --- super-intel.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'super-intel.c') diff --git a/super-intel.c b/super-intel.c index bdd7a96..dd9699d 100644 --- a/super-intel.c +++ b/super-intel.c @@ -4044,6 +4044,15 @@ static void update_recovery_start(struct imsm_dev *dev, struct mdinfo *array) rebuild = d; } + if (!rebuild) { + /* (?) none of the disks are marked with + * IMSM_ORD_REBUILD, so assume they are missing and the + * disk_ord_tbl was not correctly updated + */ + dprintf("%s: failed to locate out-of-sync disk\n", __func__); + return; + } + units = __le32_to_cpu(dev->vol.curr_migr_unit); rebuild->recovery_start = units * blocks_per_migr_unit(dev); } -- cgit