shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

cov: overflow before widen

Browse Source 
Evaluate as 64bit arithmetic (instead of doing 32bit mults which can
in this case purely teoretically overflow).
This commit is contained in:
Zdenek Kabelac 2018-11-02 21:10:21 +01:00
parent bc1976011a
commit c7789daec0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/data-struct/radix-tree-adaptive.c
View File

@ -623,7 +623,7 @@ static void _degrade_to_n48(struct node256 *n256, struct value *result)
} }
// Removes an entry in an array by sliding the values above it down. // Removes an entry in an array by sliding the values above it down.
static void _erase_elt(void *array, unsigned obj_size, unsigned count, unsigned index) static void _erase_elt(void *array, size_t obj_size, unsigned count, unsigned index)
{ {
if (index == (count - 1)) if (index == (count - 1))
// The simple case // The simple case

6
lib/locking/lvmlockd.c
View File

@ -389,7 +389,7 @@ static int _extend_sanlock_lv(struct cmd_context *cmd, struct volume_group *vg,
.resize = LV_EXTEND, .resize = LV_EXTEND,
.force = 1, .force = 1,
}; };
int i; uint64_t i;
extend_bytes = extend_mb * ONE_MB_IN_BYTES; extend_bytes = extend_mb * ONE_MB_IN_BYTES;
extend_sectors = extend_bytes / SECTOR_SIZE; extend_sectors = extend_bytes / SECTOR_SIZE;
@ -443,8 +443,8 @@ static int _extend_sanlock_lv(struct cmd_context *cmd, struct volume_group *vg,
for (i = 0; i < extend_mb; i++) { for (i = 0; i < extend_mb; i++) {
if (!dev_write_zeros(dev, old_size_bytes + (i * ONE_MB_IN_BYTES), ONE_MB_IN_BYTES)) { if (!dev_write_zeros(dev, old_size_bytes + (i * ONE_MB_IN_BYTES), ONE_MB_IN_BYTES)) {
log_error("Extend sanlock LV %s cannot zero device at %llu.", display_lvname(lv), log_error("Extend sanlock LV %s cannot zero device at " FMTu64 ".",
(unsigned long long)(old_size_bytes + i * ONE_MB_IN_BYTES)); display_lvname(lv), (old_size_bytes + i * ONE_MB_IN_BYTES));
label_scan_invalidate(dev); label_scan_invalidate(dev);
return 0; return 0;
} }