summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlasdair G Kergon2005-11-22 06:32:33 +0100
committerLinus Torvalds2005-11-22 18:14:31 +0100
commitc4cc66351a24da5feec298be2da59a85f68dd3ea (patch)
tree76b03b0bfa3d6db905b9b7e26997263b01cbe3ee
parent[PATCH] device-mapper dm-ioctl: missing put in table load error case (diff)
downloadkernel-qcow2-linux-c4cc66351a24da5feec298be2da59a85f68dd3ea.tar.gz
kernel-qcow2-linux-c4cc66351a24da5feec298be2da59a85f68dd3ea.tar.xz
kernel-qcow2-linux-c4cc66351a24da5feec298be2da59a85f68dd3ea.zip
[PATCH] device-mapper: list_versions fix
In some circumstances the LIST_VERSIONS output is truncated because the size calculation forgets about a 'uint32_t' in each structure - but the inclusion of the whole of ALIGN_MASK frequently compensates for the omission. This is a quick workaround to use an upper bound. (The code ought to be fixed to supply the actual size.) Running 'dmsetup targets' may demonstrate the problem: when I run it, the last line comes out as 'erro' instead of 'error'. Consequently, 'lvcreate --type error' doesn't work. Signed-off-by: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/md/dm-ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index a90b053368ee..07d44e19536e 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -425,8 +425,8 @@ static void list_version_get_needed(struct target_type *tt, void *needed_param)
{
size_t *needed = needed_param;
+ *needed += sizeof(struct dm_target_versions);
*needed += strlen(tt->name);
- *needed += sizeof(tt->version);
*needed += ALIGN_MASK;
}