From 2112fc571a0dafa5f66f60ff62e6e634e3045960 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 7 Apr 2009 10:22:14 +0000 Subject: [PATCH] Use pv from newly read_vg to avoid possible use of not initialized memory. 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.) --- tools/toollib.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/toollib.c b/tools/toollib.c index 1a2fd01e8..aa2194ceb 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -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) { -- 2.43.5