shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

lvmetad: fix memleak on pv_found error path

Browse Source 
Free resources allocated in pv_found when going out
through error path.
This commit is contained in:
Zdenek Kabelac 2012-12-14 16:43:42 +01:00
parent 399fc1bb33
commit ba3f37c9e4
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.99 - Version 2.02.99 -
=================================== ===================================
Fix memleak on error path for lvmetad's pv_found.
Unlock vg mutex in error path when lvmetad tries to lock_vg. Unlock vg mutex in error path when lvmetad tries to lock_vg.
Add check for key string duplication in config_make_nodes_v. Add check for key string duplication in config_make_nodes_v.
Add check for created fid in _scan_file. Add check for created fid in _scan_file.

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

@ -827,7 +827,7 @@ static response pv_found(lvmetad_state *s, request r)
uint64_t device; uint64_t device;
struct dm_config_tree *cft, *pvmeta_old_dev = NULL, *pvmeta_old_pvid = NULL; struct dm_config_tree *cft, *pvmeta_old_dev = NULL, *pvmeta_old_pvid = NULL;
char *old; char *old;
const char *pvid_dup; char *pvid_dup;
int complete = 0, orphan = 0; int complete = 0, orphan = 0;
int64_t seqno = -1, seqno_old = -1; int64_t seqno = -1, seqno_old = -1;
@ -854,13 +854,23 @@ static response pv_found(lvmetad_state *s, request r)
if (!(cft = dm_config_create()) || if (!(cft = dm_config_create()) ||
!(cft->root = dm_config_clone_node(cft, pvmeta, 0))) { !(cft->root = dm_config_clone_node(cft, pvmeta, 0))) {
unlock_pvid_to_pvmeta(s); unlock_pvid_to_pvmeta(s);
if (cft)
dm_config_destroy(cft);
return reply_fail("out of memory");
}
if (!(pvid_dup = dm_strdup(pvid))) {
unlock_pvid_to_pvmeta(s);
dm_config_destroy(cft);
return reply_fail("out of memory"); return reply_fail("out of memory");
} }
pvid_dup = dm_strdup(pvid);
if (!dm_hash_insert(s->pvid_to_pvmeta, pvid, cft) || if (!dm_hash_insert(s->pvid_to_pvmeta, pvid, cft) ||
!dm_hash_insert_binary(s->device_to_pvid, &device, sizeof(device), (void*)pvid_dup)) { !dm_hash_insert_binary(s->device_to_pvid, &device, sizeof(device), (void*)pvid_dup)) {
unlock_pvid_to_pvmeta(s); unlock_pvid_to_pvmeta(s);
dm_hash_remove(s->pvid_to_pvmeta, pvid);
dm_config_destroy(cft);
dm_free(pvid_dup);
return reply_fail("out of memory"); return reply_fail("out of memory");
} }
if (pvmeta_old_pvid) if (pvmeta_old_pvid)