From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Mon, 15 Aug 2016 20:21:33 +0000 (-0400)
Subject: bitmap: Handle errors when reading bitmap info for cluster nodes
X-Git-Tag: mdadm-4.0~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34996a5f89c6808f77ec552b7c920013b46bf13d;p=thirdparty%2Fmdadm.git

bitmap: Handle errors when reading bitmap info for cluster nodes

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---

diff --git a/bitmap.c b/bitmap.c
index 29c36a65..e9dee738 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -350,7 +350,17 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
 			st = NULL;
 			free(info);
 			fd = bitmap_file_open(filename, &st, i);
+			if (fd < 0) {
+				printf("   Unable to open bitmap file on node: %i\n", i);
+
+				continue;
+			}
 			info = bitmap_fd_read(fd, brief);
+			if (!info) {
+				close(fd);
+				printf("   Unable to read bitmap on node: %i\n", i);
+				continue;
+			}
 			sb = &info->sb;
 			if (sb->magic != BITMAP_MAGIC)
 				pr_err("invalid bitmap magic 0x%x, the bitmap file appears to be corrupted\n", sb->magic);