[lvm-devel] [PATCH] Fix pvmove region_size overflow for very large PVs.
Milan Broz
mbroz at redhat.com
Fri Nov 13 17:00:20 UTC 2009
Fixes problem reported in
https://www.redhat.com/archives/dm-devel/2009-November/msg00104.html
The region size multiplication can overflow when using 32bit integer.
(Also moving the warning message into verbose level.)
Signed-off-by: Milan Broz <mbroz at redhat.com>
---
WHATS_NEW | 1 +
lib/metadata/mirror.c | 4 ++--
lib/mirror/mirrored.c | 19 ++++++-------------
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index b16bcb4..30e26d9 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.55 -
===================================
+ Fix pvmove region_size oveflow for very large PVs.
Fix lvcreate and lvresize processing of %PVS argument.
Tidy some uses of arg_count and introduce arg_is_set.
Export outnl and indent functions for modules.
diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c
index ff1ecb0..18daef3 100644
--- a/lib/metadata/mirror.c
+++ b/lib/metadata/mirror.c
@@ -128,8 +128,8 @@ uint32_t adjusted_mirror_region_size(uint32_t extent_size, uint32_t extents,
if (region_max < UINT32_MAX && region_size > region_max) {
region_size = (uint32_t) region_max;
- log_print("Using reduced mirror region size of %" PRIu32
- " sectors", region_size);
+ log_verbose("Using reduced mirror region size of %" PRIu32
+ " sectors", region_size);
}
return region_size;
diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c
index e93ed0b..29746b0 100644
--- a/lib/mirror/mirrored.c
+++ b/lib/mirror/mirrored.c
@@ -290,7 +290,7 @@ static int _mirrored_add_target_line(struct dev_manager *dm, struct dm_pool *mem
uint32_t area_count = seg->area_count;
unsigned start_area = 0u;
int mirror_status = MIRR_RUNNING;
- uint32_t region_size, region_max;
+ uint32_t region_size;
int r;
if (!*target_state)
@@ -333,18 +333,11 @@ static int _mirrored_add_target_line(struct dev_manager *dm, struct dm_pool *mem
return 0;
}
region_size = seg->region_size;
- } else {
- /* Find largest power of 2 region size unit we can use */
- region_max = (1 << (ffs((int)seg->area_len) - 1)) *
- seg->lv->vg->extent_size;
-
- region_size = mirr_state->default_region_size;
- if (region_max < region_size) {
- region_size = region_max;
- log_verbose("Using reduced mirror region size of %u sectors",
- region_size);
- }
- }
+
+ } else
+ region_size = adjusted_mirror_region_size(seg->lv->vg->extent_size,
+ seg->area_len,
+ mirr_state->default_region_size);
if (!dm_tree_node_add_mirror_target(node, len))
return_0;
--
1.6.5.2
More information about the lvm-devel
mailing list