btrfs-progs: fix memory leaks in error path
This patch includes below fixes in error path: 1. fix memory leaks if realloc() fails 2. add missing call free_history() before return error in scrub_read_file() Signed-off-by: Byongho Lee <bhlee.kernel@gmail.com> Reviewed-by: Zhao Lei <zhaolei@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
d7748770a7
commit
ae60507e59
|
@ -254,11 +254,15 @@ static int btrfs_list_setup_comparer(struct btrfs_list_comparer_set **comp_set,
|
||||||
BUG_ON(set->ncomps > set->total);
|
BUG_ON(set->ncomps > set->total);
|
||||||
|
|
||||||
if (set->ncomps == set->total) {
|
if (set->ncomps == set->total) {
|
||||||
|
void *tmp;
|
||||||
|
|
||||||
size = set->total + BTRFS_LIST_NCOMPS_INCREASE;
|
size = set->total + BTRFS_LIST_NCOMPS_INCREASE;
|
||||||
size = sizeof(*set) + size * sizeof(struct btrfs_list_comparer);
|
size = sizeof(*set) + size * sizeof(struct btrfs_list_comparer);
|
||||||
|
tmp = set;
|
||||||
set = realloc(set, size);
|
set = realloc(set, size);
|
||||||
if (!set) {
|
if (!set) {
|
||||||
fprintf(stderr, "memory allocation failed\n");
|
fprintf(stderr, "memory allocation failed\n");
|
||||||
|
free(tmp);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1232,11 +1236,15 @@ int btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set,
|
||||||
BUG_ON(set->nfilters > set->total);
|
BUG_ON(set->nfilters > set->total);
|
||||||
|
|
||||||
if (set->nfilters == set->total) {
|
if (set->nfilters == set->total) {
|
||||||
|
void *tmp;
|
||||||
|
|
||||||
size = set->total + BTRFS_LIST_NFILTERS_INCREASE;
|
size = set->total + BTRFS_LIST_NFILTERS_INCREASE;
|
||||||
size = sizeof(*set) + size * sizeof(struct btrfs_list_filter);
|
size = sizeof(*set) + size * sizeof(struct btrfs_list_filter);
|
||||||
|
tmp = set;
|
||||||
set = realloc(set, size);
|
set = realloc(set, size);
|
||||||
if (!set) {
|
if (!set) {
|
||||||
fprintf(stderr, "memory allocation failed\n");
|
fprintf(stderr, "memory allocation failed\n");
|
||||||
|
free(tmp);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
18
cmds-scrub.c
18
cmds-scrub.c
|
@ -502,12 +502,16 @@ again:
|
||||||
}
|
}
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
if (avail == -1)
|
if (avail == -1) {
|
||||||
|
free_history(p);
|
||||||
return ERR_PTR(-errno);
|
return ERR_PTR(-errno);
|
||||||
|
}
|
||||||
avail += old_avail;
|
avail += old_avail;
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
while (i < avail) {
|
while (i < avail) {
|
||||||
|
void *tmp;
|
||||||
|
|
||||||
switch (state) {
|
switch (state) {
|
||||||
case 0: /* start of file */
|
case 0: /* start of file */
|
||||||
ret = scrub_kvread(&i,
|
ret = scrub_kvread(&i,
|
||||||
|
@ -534,11 +538,17 @@ again:
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
++curr;
|
++curr;
|
||||||
|
tmp = p;
|
||||||
p = realloc(p, (curr + 2) * sizeof(*p));
|
p = realloc(p, (curr + 2) * sizeof(*p));
|
||||||
if (p)
|
if (!p) {
|
||||||
p[curr] = malloc(sizeof(**p));
|
free_history(tmp);
|
||||||
if (!p || !p[curr])
|
|
||||||
return ERR_PTR(-errno);
|
return ERR_PTR(-errno);
|
||||||
|
}
|
||||||
|
p[curr] = malloc(sizeof(**p));
|
||||||
|
if (!p[curr]) {
|
||||||
|
free_history(p);
|
||||||
|
return ERR_PTR(-errno);
|
||||||
|
}
|
||||||
memset(p[curr], 0, sizeof(**p));
|
memset(p[curr], 0, sizeof(**p));
|
||||||
p[curr + 1] = NULL;
|
p[curr + 1] = NULL;
|
||||||
++state;
|
++state;
|
||||||
|
|
|
@ -174,11 +174,16 @@ out:
|
||||||
|
|
||||||
static int add_clone_source(struct btrfs_send *s, u64 root_id)
|
static int add_clone_source(struct btrfs_send *s, u64 root_id)
|
||||||
{
|
{
|
||||||
|
void *tmp;
|
||||||
|
|
||||||
|
tmp = s->clone_sources;
|
||||||
s->clone_sources = realloc(s->clone_sources,
|
s->clone_sources = realloc(s->clone_sources,
|
||||||
sizeof(*s->clone_sources) * (s->clone_sources_count + 1));
|
sizeof(*s->clone_sources) * (s->clone_sources_count + 1));
|
||||||
|
|
||||||
if (!s->clone_sources)
|
if (!s->clone_sources) {
|
||||||
|
free(tmp);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
}
|
||||||
s->clone_sources[s->clone_sources_count++] = root_id;
|
s->clone_sources[s->clone_sources_count++] = root_id;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
8
qgroup.c
8
qgroup.c
|
@ -465,12 +465,16 @@ int btrfs_qgroup_setup_comparer(struct btrfs_qgroup_comparer_set **comp_set,
|
||||||
BUG_ON(set->ncomps > set->total);
|
BUG_ON(set->ncomps > set->total);
|
||||||
|
|
||||||
if (set->ncomps == set->total) {
|
if (set->ncomps == set->total) {
|
||||||
|
void *tmp;
|
||||||
|
|
||||||
size = set->total + BTRFS_QGROUP_NCOMPS_INCREASE;
|
size = set->total + BTRFS_QGROUP_NCOMPS_INCREASE;
|
||||||
size = sizeof(*set) +
|
size = sizeof(*set) +
|
||||||
size * sizeof(struct btrfs_qgroup_comparer);
|
size * sizeof(struct btrfs_qgroup_comparer);
|
||||||
|
tmp = set;
|
||||||
set = realloc(set, size);
|
set = realloc(set, size);
|
||||||
if (!set) {
|
if (!set) {
|
||||||
fprintf(stderr, "memory allocation failed\n");
|
fprintf(stderr, "memory allocation failed\n");
|
||||||
|
free(tmp);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -836,12 +840,16 @@ int btrfs_qgroup_setup_filter(struct btrfs_qgroup_filter_set **filter_set,
|
||||||
BUG_ON(set->nfilters > set->total);
|
BUG_ON(set->nfilters > set->total);
|
||||||
|
|
||||||
if (set->nfilters == set->total) {
|
if (set->nfilters == set->total) {
|
||||||
|
void *tmp;
|
||||||
|
|
||||||
size = set->total + BTRFS_QGROUP_NFILTERS_INCREASE;
|
size = set->total + BTRFS_QGROUP_NFILTERS_INCREASE;
|
||||||
size = sizeof(*set) + size * sizeof(struct btrfs_qgroup_filter);
|
size = sizeof(*set) + size * sizeof(struct btrfs_qgroup_filter);
|
||||||
|
|
||||||
|
tmp = set;
|
||||||
set = realloc(set, size);
|
set = realloc(set, size);
|
||||||
if (!set) {
|
if (!set) {
|
||||||
fprintf(stderr, "memory allocation failed\n");
|
fprintf(stderr, "memory allocation failed\n");
|
||||||
|
free(tmp);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
memset(&set->filters[set->total], 0,
|
memset(&set->filters[set->total], 0,
|
||||||
|
|
Loading…
Reference in New Issue