From 60e1bc1a335f3ff010b3ea189b63e1a41ea44bde Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Thu, 9 Nov 2006 09:38:50 +1100 Subject: Fixed problems that could cause infinitel loop with auto assemble. If an auto-assembly attempt failes because the array cannot be opened or because the array has already been created, then we get into an infinite loop. Reported-by: Dan Pascu Fixes-debian-bug: 396582 --- Assemble.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'Assemble.c') diff --git a/Assemble.c b/Assemble.c index e8fec8e..6ca54f9 100644 --- a/Assemble.c +++ b/Assemble.c @@ -185,6 +185,8 @@ int Assemble(struct supertype *st, char *mddev, int mdfd, else if (mdfd >= 0) inargv = 1; + try_again: + tmpdev = devlist; num_devs = 0; while (tmpdev) { if (tmpdev->used) @@ -383,14 +385,28 @@ int Assemble(struct supertype *st, char *mddev, int mdfd, else asprintf(&mddev, "/dev/md/%s", c); mdfd = open_mddev(mddev, ident->autof); - if (mdfd < 0) - return mdfd; + if (mdfd < 0) { + free(first_super); + free(devices); + first_super = NULL; + goto try_again; + } vers = md_get_version(mdfd); if (ioctl(mdfd, GET_ARRAY_INFO, &inf)==0) { + for (tmpdev = devlist ; + tmpdev && tmpdev->used != 1; + tmpdev = tmpdev->next) + ; fprintf(stderr, Name ": %s already active, cannot restart it!\n", mddev); + if (tmpdev) + fprintf(stderr, Name ": %s needed for %s...\n", + mddev, tmpdev->devname); close(mdfd); + mdfd = -1; free(first_super); - return 1; + free(devices); + first_super = NULL; + goto try_again; } must_close = 1; } -- cgit