Assemble: prevent segfault with faulty "best" devices

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index 3c10b6cd27c20074793a1f9b00af43e4771f78cc..9e19246caccadf3ccb97b0189e04ac181cd019e0 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -1671,6 +1671,8 @@ try_again:
                int j = best[i];
                unsigned int desired_state;
 
+               if (j < 0)
+                       continue;
                if (devices[j].i.disk.raid_disk == MD_DISK_ROLE_JOURNAL)
                        desired_state = (1<<MD_DISK_JOURNAL);
                else if (i >= content->array.raid_disks * 2)
@@ -1680,8 +1682,6 @@ try_again:
                else
                        desired_state = (1<<MD_DISK_ACTIVE) | (1<<MD_DISK_SYNC);
 
-               if (j<0)
-                       continue;
                if (!devices[j].uptodate)
                        continue;