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

lvmetad: free memory on exit

Browse Source 
This is unnecessary but it quiets complaints (valgrind).
This commit is contained in:
David Teigland 2016-07-18 11:31:00 -05:00
parent 9c6a26f50a
commit 4b4d467004
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
daemons/lvmetad/lvmetad-core.c
View File

@ -808,6 +808,7 @@ static int _update_pvid_to_vgid(lvmetad_state *s, struct dm_config_tree *vg,
if (!dm_hash_insert(s->pvid_to_vgid, pvid, vgid_dup)) { if (!dm_hash_insert(s->pvid_to_vgid, pvid, vgid_dup)) {
ERROR(s, "update_pvid_to_vgid out of memory for hash insert vgid %s", vgid_dup); ERROR(s, "update_pvid_to_vgid out of memory for hash insert vgid %s", vgid_dup);
dm_free(vgid_dup);
goto abort_daemon; goto abort_daemon;
} }
@ -829,6 +830,8 @@ static int _update_pvid_to_vgid(lvmetad_state *s, struct dm_config_tree *vg,
abort_daemon: abort_daemon:
ERROR(s, "lvmetad could not be updated and is aborting."); ERROR(s, "lvmetad could not be updated and is aborting.");
if (to_check)
dm_hash_destroy(to_check);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -1201,6 +1204,10 @@ static int _update_metadata_add_new(lvmetad_state *s, const char *new_name, cons
out: out:
out_free: out_free:
if (!new_name_dup || !new_vgid_dup || abort_daemon) { if (!new_name_dup || !new_vgid_dup || abort_daemon) {
if (new_name_dup)
dm_free(new_name_dup);
if (new_vgid_dup)
dm_free(new_vgid_dup);
ERROR(s, "lvmetad could not be updated and is aborting."); ERROR(s, "lvmetad could not be updated and is aborting.");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -2051,7 +2058,7 @@ static response pv_found(lvmetad_state *s, request r)
changed |= 1; changed |= 1;
if (!dm_hash_insert(s->pvid_to_pvmeta, arg_pvid, new_pvmeta)) if (!dm_hash_insert(s->pvid_to_pvmeta, arg_pvid, new_pvmeta))
goto nomem; goto nomem_free1;
} else if (new_pvid && new_device) { } else if (new_pvid && new_device) {
/* /*
@ -2065,13 +2072,13 @@ static response pv_found(lvmetad_state *s, request r)
new_device, new_pvid); new_device, new_pvid);
if (!(new_pvid_dup = dm_strdup(new_pvid))) if (!(new_pvid_dup = dm_strdup(new_pvid)))
goto nomem; goto nomem_free1;
if (!dm_hash_insert_binary(s->device_to_pvid, &new_device, sizeof(new_device), (char *)new_pvid_dup)) if (!dm_hash_insert_binary(s->device_to_pvid, &new_device, sizeof(new_device), (char *)new_pvid_dup))
goto nomem; goto nomem_free2;
if (!dm_hash_insert(s->pvid_to_pvmeta, new_pvid, new_pvmeta)) if (!dm_hash_insert(s->pvid_to_pvmeta, new_pvid, new_pvmeta))
goto nomem; goto nomem_free1;
} else if (new_pvid && !new_device) { } else if (new_pvid && !new_device) {
/* /*
@ -2111,13 +2118,13 @@ static response pv_found(lvmetad_state *s, request r)
if (!(new_pvid_dup = dm_strdup(new_pvid))) if (!(new_pvid_dup = dm_strdup(new_pvid)))
goto nomem; goto nomem_free1;
if (!dm_hash_insert_binary(s->device_to_pvid, &arg_device, sizeof(arg_device), (char *)new_pvid_dup)) if (!dm_hash_insert_binary(s->device_to_pvid, &arg_device, sizeof(arg_device), (char *)new_pvid_dup))
goto nomem; goto nomem_free2;
if (!dm_hash_insert(s->pvid_to_pvmeta, new_pvid, new_pvmeta)) if (!dm_hash_insert(s->pvid_to_pvmeta, new_pvid, new_pvmeta))
goto nomem; goto nomem_free1;
} else if (new_device && !new_pvid) { } else if (new_device && !new_pvid) {
/* /*
@ -2225,6 +2232,10 @@ static response pv_found(lvmetad_state *s, request r)
"seqno_after = " FMTd64, (int64_t) vg_status_seqno, "seqno_after = " FMTd64, (int64_t) vg_status_seqno,
NULL); NULL);
nomem_free2:
dm_free((char *)new_pvid_dup);
nomem_free1:
dm_config_destroy(new_pvmeta);
nomem: nomem:
ERROR(s, "pv_found %s is out of memory.", arg_pvid); ERROR(s, "pv_found %s is out of memory.", arg_pvid);
ERROR(s, "lvmetad could not be updated is aborting."); ERROR(s, "lvmetad could not be updated is aborting.");