From 3ba269a0b505f5601952630812220648bcdf7120 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Sun, 20 Jun 2004 13:50:42 +0000 Subject: [PATCH] Fix targets string size calc in driver. Fix a uuid free in libdm-iface. [Eric Taylor] Update version. --- VERSION | 2 +- WHATS_NEW | 4 +++- kernel/ioctl/dm-ioctl.c | 2 +- lib/ioctl/libdm-iface.c | 2 +- patches/common/linux-2.4.26-rc1-devmapper.patch | 2 +- patches/linux-2.4.26-rc1-devmapper-ioctl.patch | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 5431b94..c407ef6 100644 --- 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 c5cae26..e7e16a7 100644 --- 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 df6c07d..8c8a8ff 100644 --- 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 3c72e9d..b9eec82 100644 --- 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 7df1dba..e736f62 100644 --- 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 19619c1..50e5e47 100644 --- 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; + } + } -- 2.43.5