Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3750b0cff5ab1c41076afd... Commit: 3750b0cff5ab1c41076afdf8275e3fa20aa756d0 Parent: 0161ebe484005e948eab6b12bc3942e62a22819b Author: Zdenek Kabelac zkabelac@redhat.com AuthorDate: Fri Dec 21 20:12:40 2018 +0100 Committer: Zdenek Kabelac zkabelac@redhat.com CommitterDate: Fri Dec 21 21:42:30 2018 +0100

stats: fix error path when region is NULL

We should not call _stats_cleanup_region_ids() when regions are NULL. Also add backtracing for goto. --- libdm/libdm-stats.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c index ca46d9a..80cb42b 100644 --- a/libdm/libdm-stats.c +++ b/libdm/libdm-stats.c @@ -4869,24 +4869,24 @@ uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd, group_id, &count, &regroup);

if (!regions) - goto bad; + goto_out;

if (!dm_stats_list(dms, NULL)) - goto bad; + goto_bad;

/* regroup if there are regions to group */ if (regroup && (*regions != DM_STATS_REGION_NOT_PRESENT)) if (!_stats_group_file_regions(dms, regions, count, alias)) - goto bad; + goto_bad;

dm_free(bounds); dm_free((char *) alias); return regions; bad: _stats_cleanup_region_ids(dms, regions, count); - dm_free(bounds); - dm_free(regions); out: + dm_free(regions); + dm_free(bounds); dm_free((char *) alias); return NULL; }