Fix targets string size calc in driver.

Fix a uuid free in libdm-iface. [Eric Taylor]
Update version.

diff --git a/VERSION b/VERSION
index 5431b94898f7fab4c3d2b4bd20d7a1090596c23f..c407ef6f4687a368de12e402e6bcd0f2e99f8c72 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.00.18-cvs (2004-06-08)
+1.00.18-cvs (2004-06-20)

diff --git a/WHATS_NEW b/WHATS_NEW
index c5cae26ffdd33096c75888ec2dd181d0df424e9b..e7e16a78fb735500847e928ead2ca29e80ec2e48 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
-Version 1.00.18
+Version 1.00.18 - 20 Jun 2004
 =============================
+  Fix a uuid free in libdm-iface.
+  Fix a targets string size calc in driver.
   Add -c to dmsetup for column-based output.
   Add target message-passing ioctl.
 

diff --git a/kernel/ioctl/dm-ioctl.c b/kernel/ioctl/dm-ioctl.c
index df6c07df2174f9c5378ea29456f8c48abf740a16..8c8a8ff134fa66b8210a0f1bf854b96886a69c91 100644 (file)
--- a/kernel/ioctl/dm-ioctl.c
+++ b/kernel/ioctl/dm-ioctl.c
@@ -387,7 +387,7 @@ static int list_devices(struct dm_ioctl *param, size_t param_size)
        for (i = 0; i < NUM_BUCKETS; i++) {
                list_for_each_entry (hc, _name_buckets + i, name_list) {
                        needed += sizeof(struct dm_name_list);
-                       needed += strlen(hc->name);
+                       needed += strlen(hc->name) + 1;
                        needed += ALIGN_MASK;
                }
        }

diff --git a/lib/ioctl/libdm-iface.c b/lib/ioctl/libdm-iface.c
index 3c72e9d5abd71607e906367f922ecfb4cf088733..b9eec824eb9b166daeb40e6d847a1c67b17dc268 100644 (file)
--- a/lib/ioctl/libdm-iface.c
+++ b/lib/ioctl/libdm-iface.c
@@ -1121,8 +1121,8 @@ static int _create_and_load_v4(struct dm_task *dmt)
 
        /* Use the original structure last so the info will be correct */
        dmt->type = DM_DEVICE_RESUME;
-       dmt->uuid = NULL;
        free(dmt->uuid);
+       dmt->uuid = NULL;
 
        r = dm_task_run(dmt);
 

diff --git a/patches/common/linux-2.4.26-rc1-devmapper.patch b/patches/common/linux-2.4.26-rc1-devmapper.patch
index 7df1dbad11b23fcb06b2a1531faece5e89f33904..e736f6214041dcb8e4ba60ebacecd63219e30306 100644 (file)
--- a/patches/common/linux-2.4.26-rc1-devmapper.patch
+++ b/patches/common/linux-2.4.26-rc1-devmapper.patch
@@ -1667,7 +1667,7 @@
 +      for (i = 0; i < NUM_BUCKETS; i++) {
 +              list_for_each_entry (hc, _name_buckets + i, name_list) {
 +                      needed += sizeof(struct dm_name_list);
-+                      needed += strlen(hc->name);
++                      needed += strlen(hc->name) + 1;
 +                      needed += ALIGN_MASK;
 +              }
 +      }

diff --git a/patches/linux-2.4.26-rc1-devmapper-ioctl.patch b/patches/linux-2.4.26-rc1-devmapper-ioctl.patch
index 19619c1d9e8a97afd5212f688658c0aff4700c29..50e5e47ce147d2283f3b10d5316474dbefa9380c 100644 (file)
--- a/patches/linux-2.4.26-rc1-devmapper-ioctl.patch
+++ b/patches/linux-2.4.26-rc1-devmapper-ioctl.patch
@@ -1971,7 +1971,7 @@
 +      for (i = 0; i < NUM_BUCKETS; i++) {
 +              list_for_each_entry (hc, _name_buckets + i, name_list) {
 +                      needed += sizeof(struct dm_name_list);
-+                      needed += strlen(hc->name);
++                      needed += strlen(hc->name) + 1;
 +                      needed += ALIGN_MASK;
 +              }
 +      }