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

lvm2app: lvm_list_pvs_free seg. fault when no PVs

Browse Source 
When the system has no PVs we don't have access to
the cmd pointer and it remains NULL which causes
a seg. fault when we try to free the VG lock.

Signed-off-by: Tony Asleson <tasleson@redhat.com>
This commit is contained in:
Tony Asleson 2013-08-14 15:14:42 -05:00
parent 732e609fe2
commit c29c64f20d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
liblvm/lvm_pv.c
View File

@ -65,6 +65,7 @@ struct lvm_property_value lvm_pvseg_get_property(const pvseg_t pvseg,
struct lvm_list_wrapper struct lvm_list_wrapper
{ {
unsigned long magic; unsigned long magic;
struct cmd_context *cmd;
struct dm_list pvslist; struct dm_list pvslist;
struct dm_list vgslist; struct dm_list vgslist;
}; };
@ -84,6 +85,11 @@ struct dm_list *lvm_list_pvs(lvm_t libh)
struct lvm_list_wrapper *rc = NULL; struct lvm_list_wrapper *rc = NULL;
struct cmd_context *cmd = (struct cmd_context *)libh; struct cmd_context *cmd = (struct cmd_context *)libh;
/*
* This memory will get cleared when the library handle
* gets closed, don't try to free is as it doesn't work
* like malloc/free do.
*/
if (!(rc = dm_pool_zalloc(cmd->mem, sizeof(*rc)))) { if (!(rc = dm_pool_zalloc(cmd->mem, sizeof(*rc)))) {
log_errno(ENOMEM, "Memory allocation fail for pv list."); log_errno(ENOMEM, "Memory allocation fail for pv list.");
return NULL; return NULL;
@ -95,9 +101,14 @@ struct dm_list *lvm_list_pvs(lvm_t libh)
dm_list_init(&rc->pvslist); dm_list_init(&rc->pvslist);
dm_list_init(&rc->vgslist); dm_list_init(&rc->vgslist);
if( !get_pvs_perserve_vg(cmd, &rc->pvslist, &rc->vgslist) ) { if( !get_pvs_perserve_vg(cmd, &rc->pvslist, &rc->vgslist) ) {
dm_pool_free(cmd->mem, rc);
return NULL; return NULL;
} }
/*
* If we have no PVs we still need to have access to cmd
* pointer in the free call.
*/
rc->cmd = cmd;
rc->magic = 0xF005BA11; rc->magic = 0xF005BA11;
} }
@ -109,7 +120,6 @@ int lvm_list_pvs_free(struct dm_list *pvlist)
struct lvm_list_wrapper *to_delete; struct lvm_list_wrapper *to_delete;
struct vg_list *vgl; struct vg_list *vgl;
struct pv_list *pvl; struct pv_list *pvl;
struct cmd_context *cmd = NULL;
if (pvlist) { if (pvlist) {
to_delete = dm_list_struct_base(pvlist, struct lvm_list_wrapper, pvslist); to_delete = dm_list_struct_base(pvlist, struct lvm_list_wrapper, pvslist);
@ -119,17 +129,14 @@ int lvm_list_pvs_free(struct dm_list *pvlist)
} }
dm_list_iterate_items(vgl, &to_delete->vgslist) { dm_list_iterate_items(vgl, &to_delete->vgslist) {
cmd = vgl->vg->cmd;
release_vg(vgl->vg); release_vg(vgl->vg);
} }
dm_list_iterate_items(pvl, &to_delete->pvslist) dm_list_iterate_items(pvl, &to_delete->pvslist)
free_pv_fid(pvl->pv); free_pv_fid(pvl->pv);
unlock_vg(cmd, VG_GLOBAL); unlock_vg(to_delete->cmd, VG_GLOBAL);
to_delete->magic = 0xA5A5A5A5; to_delete->magic = 0xA5A5A5A5;
dm_pool_free(cmd->mem, to_delete);
} }
return 0; return 0;