Changeset 2237 in MondoRescue

Timestamp:

Jun 19, 2009, 9:10:17 PM (16 years ago)

Author:

Bruno Cornec

Message:

Fix a bug (seg fault) when a too large mountlist was used. Increased MAXIMUM_DISKS_PER_RAID_DEV which serve as table allocation for drivelist, which should be as big as mountlist in fact ! (which it is still not, but is now sufficently large to be correct). Again dynamic memory allocation is the solution. Or perl ;-)

Location:

branches/2.2.9/mondo/src

Files:

• common/libmondo-mountlist.c (modified) (2 diffs)
• common/libmondo-string.c (modified) (2 diffs)
• include/my-stuff.h (modified) (1 diff)

branches/2.2.9/mondo/src/common/libmondo-mountlist.c

@@ -678 +678 @@
         log_msg(8, "Putting %s with size %lli in list of drives", drive, size);
 
+        /* memory allocation */
         truncdrive = truncate_to_drive_name(drive);
+        paranoid_free(drive);
+
         log_msg(8, "drive truncated to %s", truncdrive);
 
@@ -687 +690 @@
         }
         if (j == noof_drives) {
-            strncpy(drivelist->el[noof_drives].device, drive, 63);
+            strncpy(drivelist->el[noof_drives].device, truncdrive, 63);
             drivelist->el[noof_drives].device[63] = '\0';
             log_msg(8,"Adding drive %s to list", drivelist->el[noof_drives].device);
             noof_drives++;
         }
-        paranoid_free(drive);
         paranoid_free(truncdrive);
+        if (noof_drives >= MAXIMUM_DISKS_PER_RAID_DEV) {
+            log_msg(0, "Unable to handle mountlist with more than %d lines", MAXIMUM_DISKS_PER_RAID_DEV);
+            log_to_screen("Unable to handle a so big mountlist");
+            finish(1);
+        }
     }
     drivelist->entries = noof_drives;

branches/2.2.9/mondo/src/common/libmondo-string.c

@@ -843 +843 @@
     char *trunc = NULL;
 
+    assert_string_is_neither_NULL_nor_zerolength(partition);
     mr_asprintf(&trunc, "%s", partition);
 
@@ -858 +859 @@
 #else
 
-    assert_string_is_neither_NULL_nor_zerolength(partition);
     /* first see if it's a devfs style device */
     c = strrchr(trunc, '/');

branches/2.2.9/mondo/src/include/my-stuff.h

@@ -124 +124 @@
 #define MAXIMUM_RAID_DEVS 32    ///< The maximum number of RAID devices in the raidlist.
 #define MAXIMUM_ADDITIONAL_RAID_VARS 32 ///< The maximum number of additional RAID variables per RAID device in the raidlist.
-#define MAXIMUM_DISKS_PER_RAID_DEV 32   ///< The maximum number of disks per RAID device in the raidtab.
+#define MAXIMUM_DISKS_PER_RAID_DEV 1024 ///< The maximum number of disks per RAID device in the raidtab.
 
 #define RAIDTAB_FNAME "/etc/raidtab"    ///< The filename of the raidtab file, at least on Linux.