shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

libdm: grow with initialized struct content

Browse Source 
Coverity noticed struct hist has been copied uninitalized into mempool.
This commit is contained in:
Zdenek Kabelac 2016-02-22 11:14:30 +01:00
parent 30a73d1604
commit 275c9f7e77
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.118 - Version 1.02.118 -
===================================== =====================================
Always initialized hist struct in _stats_parse_histogram().
Version 1.02.117 - 21st February 2016 Version 1.02.117 - 21st February 2016
===================================== =====================================

10
libdm/libdm-stats.c
View File

@ -740,9 +740,11 @@ static int _stats_parse_histogram(struct dm_pool *mem, char *hist_str,
struct dm_histogram **histogram, struct dm_histogram **histogram,
struct dm_stats_region *region) struct dm_stats_region *region)
{ {
struct dm_histogram hist, *bounds = region->bounds; struct dm_histogram *bounds = region->bounds;
static const char *_valid_chars = "0123456789:"; static const char *_valid_chars = "0123456789:";
int nr_bins = region->bounds->nr_bins; struct dm_histogram hist = {
.nr_bins = region->bounds->nr_bins
};
const char *c, *v, *val_start; const char *c, *v, *val_start;
struct dm_histogram_bin cur; struct dm_histogram_bin cur;
uint64_t sum = 0, this_val; uint64_t sum = 0, this_val;
@ -754,8 +756,6 @@ static int _stats_parse_histogram(struct dm_pool *mem, char *hist_str,
if (!dm_pool_begin_object(mem, sizeof(cur))) if (!dm_pool_begin_object(mem, sizeof(cur)))
return_0; return_0;
hist.nr_bins = nr_bins;
if (!dm_pool_grow_object(mem, &hist, sizeof(hist))) if (!dm_pool_grow_object(mem, &hist, sizeof(hist)))
goto_bad; goto_bad;
@ -800,7 +800,7 @@ static int _stats_parse_histogram(struct dm_pool *mem, char *hist_str,
} }
} while (*c && (*c != '\n')); } while (*c && (*c != '\n'));
log_debug("Added region histogram data with %d entries.", nr_bins); log_debug("Added region histogram data with %d entries.", hist.nr_bins);
*histogram = dm_pool_end_object(mem); *histogram = dm_pool_end_object(mem);
(*histogram)->sum = sum; (*histogram)->sum = sum;