use proper pv structure in process_each_segment_in_pv
PATCH 1/1 use proper pv structure in process_each_segment_in_pv
Use pv from newly read vg to avoid possible unallocated memory use.
If the vg in process_each_segment_in_pv is NULL, the pv struct can be incomplete (for example lv_segs are not copied in get_pvs() call).
We need use the new pv from just read-in volume group.
(The same code is in pvdisplay already.)
Signed-off-by Milan Broz <[email protected]>
--- tools/toollib.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
tools/toollib.c +13 -0
@@ -364,6 +364,7 @@ int process_each_segment_in_pv(struct cmd_context *cmd, void *handle)) {struct pv_segment *pvseg; +struct pv_list *pvl;const char *vg_name =NULL ;int ret_max =ECMD_PROCESSED ;int ret;
@@ -376,6 +377,18 @@ int process_each_segment_in_pv(struct cmd_context *cmd,log_error ("Skipping volume group %s" , vg_name);return ECMD_FAILED ; } + +/* +* Replace possibly incomplete PV structure with new one +* allocated in vg_read_internal() path. +*/ +if (!(pvl =find_pv_in_vg (vg,pv_dev_name (pv)))) { +log_error ("Unable to find %s in volume group %s" , +pv_dev_name (pv), vg_name); +return ECMD_FAILED ; + } + + pv = pvl->pv; } dm_list_iterate_items(pvseg, &pv->segments) {
PATCH 1/1 use proper pv structure in process_each_segment_in_pv
Quoted 1 line · Milan Broz
Use pv from newly read vg to avoid possible unallocated memory use.
Do you maybe mean uninitialised here?
Quoted 1 line
We need use the new pv from just read-in volume group.
Quite sensible.
Quoted 1 line
Signed-off-by Milan Broz <[email protected]>
Acked-by Petr Ro?kai <[email protected]>
Quoted 21 lines
tools/toollib.c +6
-0@@ -364,6 +364,7 @@ int process_each_segment_in_pv(struct cmd_context *cmd, void *handle)) {struct pv_segment *pvseg; +struct pv_list *pvl;const char *vg_name =NULL ;int ret_max =ECMD_PROCESSED ;int ret;@@ -376,6 +377,18 @@ int process_each_segment_in_pv(struct cmd_context *cmd,log_error ("Skipping volume group %s" , vg_name);return ECMD_FAILED ; } + +/* +* Replace possibly incomplete PV structure with new one +* allocated in vg_read_internal() path. +*/
tools/toollib.c int process_each_segment_in_pv(struct cmd_context *cmd, · line 394
Quoted 10 lines
tools/toollib.c +7
-0+if (!(pvl =find_pv_in_vg (vg,pv_dev_name (pv)))) { +log_error ("Unable to find %s in volume group %s" , +pv_dev_name (pv), vg_name); +return ECMD_FAILED ; + } + + pv = pvl->pv; } dm_list_iterate_items(pvseg, &pv->segments) {
Check.
Signature · 6 lines
Peter Rockai | me()mornfall!net | prockai()redhat!com
http://blog.mornfall.net | http://web.mornfall.net
"In My Egotistical Opinion, most people's C programs should be
indented six feet downward and covered with dirt."
-- Blair P. Houghton on the subject of C program indentation