Fix pvmove region_size overflow for very large PVs.
PATCH 1/1 Fix pvmove region_size overflow for very large PVs.
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 <[email protected]>
--- WHATS_NEW | 1 + lib/metadata/mirror.c | 4 ++-- lib/mirror/mirrored.c | 19 ++++++------------- 3 files changed, 9 insertions(+), 15 deletions(-)
WHATS_NEW +1 -0
@@ -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.
lib/metadata/mirror.c +2 -2
@@ -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;
lib/mirror/mirrored.c +6 -13
@@ -290,7 +290,7 @@ static int _mirrored_add_target_line(struct dev_manager *dm, struct dm_pool *memuint32_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 *memreturn 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;
Signature · 1 line
1.6.5.2
PATCH 1/1 Fix pvmove region_size overflow for very large PVs.
As usually, I forgot that we must support separate loadable target module here, so duplicating the code is inevitable... Milan
---
Fix pvmove region_size overflow for very large PVs.
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 <[email protected]>
--- WHATS_NEW | 1 + lib/mirror/mirrored.c | 35 ++++++++++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-)
WHATS_NEW +1 -0
@@ -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.
lib/mirror/mirrored.c +22 -13
@@ -280,6 +280,22 @@ static int _add_log(struct dev_manager *dm, struct lv_segment *seg,return dm_tree_node_add_mirror_target_log (node, region_size, clustered, log_dlid, area_count, log_flags); } +uint32_t _adjusted_mirror_region_size (uint32_t extent_size,uint32_t extents, +uint32_t region_size) +{ +uint64_t region_max; + + region_max = (1 << (ffs ((int )extents) -1 )) * (uint64_t ) extent_size; + +if (region_max <UINT32_MAX && region_size > region_max) { + region_size = (uint32_t ) region_max; +log_verbose ("Using reduced mirror region size of %" PRIu32 +" sectors" , region_size); + } + +return region_size; +} + static int _mirrored_add_target_line(struct dev_manager *dm, struct dm_pool *mem, struct cmd_context *cmd, void **target_state, struct lv_segment *seg,
@@ -290,7 +306,7 @@ static int _mirrored_add_target_line(struct dev_manager *dm, struct dm_pool *memuint32_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 +349,11 @@ static int _mirrored_add_target_line(struct dev_manager *dm, struct dm_pool *memreturn 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;