From 9f22b13fe1726f3ac4da423a3e56441590c28d9f Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 28 Jan 2010 09:01:36 +1100 Subject: [PATCH] Assemble: error-check ->load_super References: bnc#684838 Once load_super has succeeded, it should continue to succeed. However devices can disappear etc so it is prudent to always check the return status of load_super. Signed-off-by: NeilBrown --- Assemble.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) --- mdadm-3.0.3.orig/Assemble.c +++ mdadm-3.0.3/Assemble.c @@ -621,7 +621,14 @@ int Assemble(struct supertype *st, char remove_partitions(dfd); tst = dup_super(st); - tst->ss->load_super(tst, dfd, NULL); + if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) { + fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n", + devname); + if (dfd >= 0) + close(dfd); + close(mdfd); + return 1; + } tst->ss->getinfo_super(tst, content); memcpy(content->uuid, ident->uuid, 16); @@ -664,7 +671,14 @@ int Assemble(struct supertype *st, char remove_partitions(dfd); - tst->ss->load_super(tst, dfd, NULL); + if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) { + fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n", + devname); + if (dfd >= 0) + close(dfd); + close(mdfd); + return 1; + } tst->ss->getinfo_super(tst, content); tst->ss->free_super(tst); close(dfd);