Fix vg_read() error paths to properly release upon vg_read_error().
PATCH 1/1 Fix vg_read() error paths to properly release upon vg_read_error().
Fix vg_read() error paths to properly release upon vg_read_error(). Note that in the code paths called from process_each_vg(), we release inside the iterator so no individual cleanup is needed. However there are a number of other places we missed the cleanup. Proper cleanup when vg_read_error() is true should be calling vg_release(vg), since there should be no locks held if we get an error (except in certain special cases, which IMO we should work to remove from the code).
--- tools/lvcreate.c | 4 +++- tools/lvrename.c | 4 +++- tools/lvresize.c | 1 + tools/polldaemon.c | 1 + tools/pvdisplay.c | 1 + tools/pvmove.c | 1 + tools/pvresize.c | 8 +++----- tools/reporter.c | 1 + tools/toollib.c | 1 + tools/vgextend.c | 1 + tools/vgmerge.c | 6 ++++-- tools/vgrename.c | 4 +++- tools/vgscan.c | 1 + tools/vgsplit.c | 4 +++- 14 files changed, 27 insertions(+), 11 deletions(-)
tools/lvcreate.c +3 -1
@@ -995,8 +995,10 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv)log_verbose ("Finding volume group \"%s\"" , lp.vg_name); vg =vg_read_for_update (cmd, lp.vg_name,NULL ,0 ); -if (vg_read_error (vg)) +if (vg_read_error (vg)) { +vg_release (vg);return ECMD_FAILED ; + }if (!_lvcreate (cmd, vg, &lp)) r =ECMD_FAILED ;
tools/lvrename.c +3 -1
@@ -103,8 +103,10 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)log_verbose ("Checking for existing volume group \"%s\"" , vg_name); vg =vg_read_for_update (cmd, vg_name,NULL ,0 ); -if (vg_read_error (vg)) +if (vg_read_error (vg)) { +vg_release (vg);return ECMD_FAILED ; + }if (!(lvl =find_lv_in_vg (vg, lv_name_old))) { log_error("Existing logical volume \"%s\" not found in "
tools/lvresize.c +1 -0
@@ -673,6 +673,7 @@ int lvresize(struct cmd_context *cmd, int argc, char **argv)log_verbose ("Finding volume group %s" , lp.vg_name); vg =vg_read_for_update (cmd, lp.vg_name,NULL ,0 );if (vg_read_error (vg)) { +vg_release (vg); stack;return ECMD_FAILED ; }
tools/polldaemon.c +1 -0
@@ -150,6 +150,7 @@ static int _wait_for_single_mirror(struct cmd_context *cmd, const char *name, co/* Locks the (possibly renamed) VG again */ vg = parms->poll_fns->get_copy_vg (cmd, name, uuid);if (vg_read_error (vg)) { +vg_release (vg);log_error ("ABORTING: Can't reread VG for %s" , name);/* What more could we do here? */ return 0 ;
tools/pvdisplay.c +1 -0
@@ -31,6 +31,7 @@ static int _pvdisplay_single(struct cmd_context *cmd, vg_name =pv_vg_name (pv); vg =vg_read (cmd, vg_name, (char *)&pv->vgid,0 );if (vg_read_error (vg)) { +vg_release (vg);log_error ("Skipping volume group %s" , vg_name);/* FIXME If CLUSTERED should return ECMD_PROCESSED here */ return ECMD_FAILED ;
tools/pvmove.c +1 -0
@@ -387,6 +387,7 @@ static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name, vg =_get_vg (cmd,pv_vg_name (pv));if (vg_read_error (vg)) { +vg_release (vg); stack;return ECMD_FAILED ; }
tools/pvresize.c +3 -5
@@ -37,7 +37,6 @@ static int _pv_resize_single(struct cmd_context *cmd,const char *vg_name;struct lvmcache_info *info;int mda_count =0 ; -struct volume_group *old_vg = vg;dm_list_init (&mdas);
@@ -100,7 +99,7 @@ static int _pv_resize_single(struct cmd_context *cmd,log_error ("%s: Couldn't get size." , pv_name); goto bad; } - +if (new_size) {if (new_size > size) log_warn("WARNING: %s: Overriding real size. "
@@ -127,7 +126,7 @@ static int _pv_resize_single(struct cmd_context *cmd,if (vg) { pv->size -=pv_pe_start (pv); new_pe_count =pv_size (pv) / vg->extent_size; - +if (!new_pe_count) {log_error ("%s: Size must leave space for at " "least one physical extent of "
@@ -162,8 +161,7 @@ static int _pv_resize_single(struct cmd_context *cmd, bad:unlock_vg (cmd, vg_name); -if (!old_vg) -vg_release (vg); +vg_release (vg);return r; }
tools/reporter.c +1 -0
@@ -137,6 +137,7 @@ static int _pvs_single(struct cmd_context *cmd, struct volume_group *vg, vg =vg_read (cmd, vg_name, (char *)&pv->vgid,0 );if (vg_read_error (vg)) { +vg_release (vg);log_error ("Skipping volume group %s" , vg_name);return ECMD_FAILED ; }
tools/toollib.c +1 -0
@@ -354,6 +354,7 @@ int process_each_segment_in_pv(struct cmd_context *cmd, vg =vg_read (cmd, vg_name,NULL ,0 );if (vg_read_error (vg)) { +vg_release (vg);log_error ("Skipping volume group %s" , vg_name);return ECMD_FAILED ; }
tools/vgextend.c +1 -0
@@ -45,6 +45,7 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv) vg =vg_read_for_update (cmd, vg_name,NULL ,READ_REQUIRE_RESIZEABLE |LOCK_NONBLOCKING );if (vg_read_error (vg)) { +vg_release (vg);unlock_vg (cmd,VG_ORPHANS );return ECMD_FAILED ; }
tools/vgmerge.c +4 -2
@@ -29,8 +29,10 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to,log_verbose ("Checking for volume group \"%s\"" , vg_name_to); vg_to =vg_read_for_update (cmd, vg_name_to,NULL ,0 ); -if (vg_read_error (vg_to)) -return ECMD_FAILED ; +if (vg_read_error (vg_to)) { +vg_release (vg_to); +return ECMD_FAILED ; + }log_verbose ("Checking for volume group \"%s\"" , vg_name_from); vg_from = vg_read_for_update(cmd, vg_name_from, NULL,
tools/vgrename.c +3 -1
@@ -73,8 +73,10 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,/* FIXME we used to print an error about EXPORTED, but proceeded nevertheless. */ vg =vg_read_for_update (cmd, vg_name_old, vgid,READ_ALLOW_EXPORTED ); -if (vg_read_error (vg)) +if (vg_read_error (vg)) { +vg_release (vg); return_0; + }if (lvs_in_vg_activated_by_uuid_only (vg)) {unlock_and_release_vg (cmd, vg, vg_name_old);
tools/vgscan.c +1 -0
@@ -19,6 +19,7 @@ static int vgscan_single(struct cmd_context *cmd, const char *vg_name,struct volume_group *vg, void *handle __attribute((unused))) { +/* NOTE: vg_unlock_and_release(vg) called from process_each_vg() */ if (vg_read_error (vg))return ECMD_FAILED ;
tools/vgsplit.c +3 -1
@@ -317,8 +317,10 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) vg_from =vg_read_for_update (cmd, vg_name_from,NULL ,READ_REQUIRE_RESIZEABLE ); -if (vg_read_error (vg_from)) +if (vg_read_error (vg_from)) { +vg_release (vg_from);return ECMD_FAILED ; + }log_verbose ("Checking for new volume group \"%s\"" , vg_name_to);/*
Signature · 1 line
1.6.0.6
PATCH v2 1/1 Fix vg_read() error paths to properly release upon vg_read_error()
This patch supercedes previous patch and should be ready for review/commit. The first iteration of this patch contained a few unnecessary vg_release() calls - tools that use iterators do not need to release since the iterators do the release.
PATCH 1/1 Fix vg_read() error paths to properly release upon vg_read_error().
Fix vg_read() error paths to properly release upon vg_read_error(). Note that in the iterator paths (process_each_*()), we release inside the iterator so no individual cleanup is needed. However there are a number of other places we missed the cleanup. Proper cleanup when vg_read_error() is true should be calling vg_release(vg), since there should be no locks held if we get an error (except in certain special cases, which IMO we should work to remove from the code).
Unfortunately the testsuite is unable to detect these types of memory leaks. Most of them can be easily seen if you try an operation (e.g. lvcreate) with a volume group that does not exist. Error message looks like this:
Volume group "vg2" not found
You have a memory leak (not released memory pool):
[0x1975eb8]
You have a memory leak (not released memory pool):
[0x1975eb8]
--- tools/lvcreate.c | 4 +++- tools/lvrename.c | 4 +++- tools/lvresize.c | 1 + tools/polldaemon.c | 1 + tools/pvchange.c | 4 +++- tools/pvmove.c | 1 + tools/pvresize.c | 4 ++-- tools/toollib.c | 1 + tools/vgextend.c | 1 + tools/vgmerge.c | 7 +++++-- tools/vgrename.c | 4 +++- tools/vgsplit.c | 4 +++- 12 files changed, 27 insertions(+), 9 deletions(-)
tools/lvcreate.c +3 -1
@@ -995,8 +995,10 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv)log_verbose ("Finding volume group \"%s\"" , lp.vg_name); vg =vg_read_for_update (cmd, lp.vg_name,NULL ,0 ); -if (vg_read_error (vg)) +if (vg_read_error (vg)) { +vg_release (vg);return ECMD_FAILED ; + }if (!_lvcreate (cmd, vg, &lp)) r =ECMD_FAILED ;
tools/lvrename.c +3 -1
@@ -103,8 +103,10 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)log_verbose ("Checking for existing volume group \"%s\"" , vg_name); vg =vg_read_for_update (cmd, vg_name,NULL ,0 ); -if (vg_read_error (vg)) +if (vg_read_error (vg)) { +vg_release (vg);return ECMD_FAILED ; + }if (!(lvl =find_lv_in_vg (vg, lv_name_old))) { log_error("Existing logical volume \"%s\" not found in "
tools/lvresize.c +1 -0
@@ -673,6 +673,7 @@ int lvresize(struct cmd_context *cmd, int argc, char **argv)log_verbose ("Finding volume group %s" , lp.vg_name); vg =vg_read_for_update (cmd, lp.vg_name,NULL ,0 );if (vg_read_error (vg)) { +vg_release (vg); stack;return ECMD_FAILED ; }
tools/polldaemon.c +1 -0
@@ -150,6 +150,7 @@ static int _wait_for_single_mirror(struct cmd_context *cmd, const char *name, co/* Locks the (possibly renamed) VG again */ vg = parms->poll_fns->get_copy_vg (cmd, name, uuid);if (vg_read_error (vg)) { +vg_release (vg);log_error ("ABORTING: Can't reread VG for %s" , name);/* What more could we do here? */ return 0 ;
tools/pvchange.c +3 -1
@@ -58,8 +58,10 @@ static int _pvchange_single(struct cmd_context *cmd, struct physical_volume *pv,log_verbose ("Finding volume group %s of physical volume %s" , vg_name, pv_name); vg =vg_read_for_update (cmd, vg_name,NULL ,0 ); -if (vg_read_error (vg)) +if (vg_read_error (vg)) { +vg_release (vg); return_0; + }if (!(pvl =find_pv_in_vg (vg, pv_name))) { log_error
tools/pvmove.c +1 -0
@@ -387,6 +387,7 @@ static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name, vg =_get_vg (cmd,pv_vg_name (pv));if (vg_read_error (vg)) { +vg_release (vg); stack;return ECMD_FAILED ; }
tools/pvresize.c +2 -2
@@ -100,7 +100,7 @@ static int _pv_resize_single(struct cmd_context *cmd,log_error ("%s: Couldn't get size." , pv_name); goto bad; } - +if (new_size) {if (new_size > size) log_warn("WARNING: %s: Overriding real size. "
@@ -127,7 +127,7 @@ static int _pv_resize_single(struct cmd_context *cmd,if (vg) { pv->size -=pv_pe_start (pv); new_pe_count =pv_size (pv) / vg->extent_size; - +if (!new_pe_count) {log_error ("%s: Size must leave space for at " "least one physical extent of "
tools/toollib.c +1 -0
@@ -354,6 +354,7 @@ int process_each_segment_in_pv(struct cmd_context *cmd, vg =vg_read (cmd, vg_name,NULL ,0 );if (vg_read_error (vg)) { +vg_release (vg);log_error ("Skipping volume group %s" , vg_name);return ECMD_FAILED ; }
tools/vgextend.c +1 -0
@@ -45,6 +45,7 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv) vg =vg_read_for_update (cmd, vg_name,NULL ,READ_REQUIRE_RESIZEABLE |LOCK_NONBLOCKING );if (vg_read_error (vg)) { +vg_release (vg);unlock_vg (cmd,VG_ORPHANS );return ECMD_FAILED ; }
tools/vgmerge.c +5 -2
@@ -29,13 +29,16 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to,log_verbose ("Checking for volume group \"%s\"" , vg_name_to); vg_to =vg_read_for_update (cmd, vg_name_to,NULL ,0 ); -if (vg_read_error (vg_to)) -return ECMD_FAILED ; +if (vg_read_error (vg_to)) { +vg_release (vg_to); +return ECMD_FAILED ; + }log_verbose ("Checking for volume group \"%s\"" , vg_name_from); vg_from =vg_read_for_update (cmd, vg_name_from,NULL ,LOCK_NONBLOCKING );if (vg_read_error (vg_from)) { +vg_release (vg_from);unlock_and_release_vg (cmd, vg_to, vg_name_to);return ECMD_FAILED ; }
tools/vgrename.c +3 -1
@@ -73,8 +73,10 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,/* FIXME we used to print an error about EXPORTED, but proceeded nevertheless. */ vg =vg_read_for_update (cmd, vg_name_old, vgid,READ_ALLOW_EXPORTED ); -if (vg_read_error (vg)) +if (vg_read_error (vg)) { +vg_release (vg); return_0; + }if (lvs_in_vg_activated_by_uuid_only (vg)) {unlock_and_release_vg (cmd, vg, vg_name_old);
tools/vgsplit.c +3 -1
@@ -317,8 +317,10 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) vg_from =vg_read_for_update (cmd, vg_name_from,NULL ,READ_REQUIRE_RESIZEABLE ); -if (vg_read_error (vg_from)) +if (vg_read_error (vg_from)) { +vg_release (vg_from);return ECMD_FAILED ; + }log_verbose ("Checking for new volume group \"%s\"" , vg_name_to);/*
Signature · 1 line
1.6.0.6