Message ID | 4460f13b-03bc-4ca0-aa97-facde3122be4@suse.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | [v2] xl: properly dispose of libxl_dominfo struct instances | expand |
On 14/01/2025 1:29 pm, Jan Beulich wrote: > The ssid_label field requires separate freeing; make sure to call > libxl_dominfo_dispose() as well as libxl_dominfo_init(). Since vcpuset() > calls only the former, add a call to the latter there at the same time. > > Coverity-ID: 1638727 > Coverity-ID: 1638728 > Fixes: c458c404da16 ("xl: use libxl_domain_info to get the uuid in printf_info") > Fixes: 48dab9767d2e ("tools/xl: use libxl_domain_info to get domain type for vcpu-pin") > Signed-off-by: Jan Beulich <jbeulich@suse.com> > Release-Acked-by: Oleksii Kurochko<oleksii.kurochko@gmail.com> > --- > v2: Add call to libxl_dominfo_init() to vcpuset(). Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
On Tue, Jan 14, 2025 at 02:29:12PM +0100, Jan Beulich wrote: > The ssid_label field requires separate freeing; make sure to call > libxl_dominfo_dispose() as well as libxl_dominfo_init(). Since vcpuset() > calls only the former, add a call to the latter there at the same time. > > Coverity-ID: 1638727 > Coverity-ID: 1638728 > Fixes: c458c404da16 ("xl: use libxl_domain_info to get the uuid in printf_info") > Fixes: 48dab9767d2e ("tools/xl: use libxl_domain_info to get domain type for vcpu-pin") > Signed-off-by: Jan Beulich <jbeulich@suse.com> > Release-Acked-by: Oleksii Kurochko<oleksii.kurochko@gmail.com> Acked-by: Anthony PERARD <anthony.perard@vates.tech> Thanks,
--- a/tools/xl/xl_sxp.c +++ b/tools/xl/xl_sxp.c @@ -45,8 +45,10 @@ void printf_info_sexp(int domid, libxl_d /* retrieve the UUID from dominfo, since it is probably generated * during parsing and thus does not match the real one */ + libxl_dominfo_init(&info); if (libxl_domain_info(ctx, &info, domid) == 0) { fprintf(fh, "\t(uuid " LIBXL_UUID_FMT ")\n", LIBXL_UUID_BYTES(info.uuid)); + libxl_dominfo_dispose(&info); } else { fprintf(fh, "\t(uuid <unknown>)\n"); } --- a/tools/xl/xl_vcpu.c +++ b/tools/xl/xl_vcpu.c @@ -286,6 +286,8 @@ int main_vcpupin(int argc, char **argv) if (!ignore_masks && hard) { libxl_dominfo dominfo; + libxl_dominfo_init(&dominfo); + if (libxl_domain_info(ctx, &dominfo, domid)) { fprintf(stderr, "Could not get domain info\n"); goto out; @@ -293,6 +295,8 @@ int main_vcpupin(int argc, char **argv) /* HVM and PVH domains use the same global affinity mask */ apply_global_affinity_masks(dominfo.domain_type, hard, 1); + + libxl_dominfo_dispose(&dominfo); } if (force) { @@ -348,6 +352,7 @@ static int vcpuset(uint32_t domid, const unsigned int online_vcpus, host_cpu = libxl_get_max_cpus(ctx); libxl_dominfo dominfo; + libxl_dominfo_init(&dominfo); if (libxl_domain_info(ctx, &dominfo, domid)) return 1;
The ssid_label field requires separate freeing; make sure to call libxl_dominfo_dispose() as well as libxl_dominfo_init(). Since vcpuset() calls only the former, add a call to the latter there at the same time. Coverity-ID: 1638727 Coverity-ID: 1638728 Fixes: c458c404da16 ("xl: use libxl_domain_info to get the uuid in printf_info") Fixes: 48dab9767d2e ("tools/xl: use libxl_domain_info to get domain type for vcpu-pin") Signed-off-by: Jan Beulich <jbeulich@suse.com> Release-Acked-by: Oleksii Kurochko<oleksii.kurochko@gmail.com> --- v2: Add call to libxl_dominfo_init() to vcpuset().